Support for Ruby 3 and rails 7 (#1)

Co-authored-by: Bolo Michelin <>

Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development, :test do
   gem "rake"
   gem "sqlite3"
-  gem "machinist", "1.0.6"
+  gem "machinist"
   gem "faker"
   gem "rspec"
 end

lib/rgviz_rails.rb

@@ -11,7 +11,7 @@ def date.as_json(options = {})
     end
     def date.encode_json(*)
       month = strftime("%m").to_i - 1
-      "new Date(#{strftime("%Y,#{month},%d")})"
+      "Date(#{strftime("%Y,#{month},%d")})"
     end
     date
   end
@@ -22,7 +22,7 @@ def time.as_json(*)
     end
     def time.encode_json(*)
       month = strftime("%m").to_i - 1
-      "new Date(#{strftime("%Y,#{month},%d,%H,%M,%S")})"
+      "Date(#{strftime("%Y,#{month},%d,%H,%M,%S")})"
     end
     time
   end
@@ -32,7 +32,7 @@ def time.as_json(*)
       self
     end
     def time.encode_json(*)
-      "new Date(#{strftime('0,0,0,%H,%M,%S')})"
+      "Date(#{strftime('0,0,0,%H,%M,%S')})"
     end
     time
   end

lib/rgviz_rails/executor.rb

@@ -185,14 +185,14 @@ def generate_rows
         end
       end
 
-      results = @model_class.send :all,
-        :select => @selects.join(','),
-        :conditions => conditions,
-        :group => @group,
-        :order => @order,
-        :limit => @query.limit,
-        :offset => @query.offset,
-        :joins => @joins
+      results = @model_class
+        .select(@selects.join(','))
+        .where(conditions)
+        .group(@group)
+        .order(@order)
+        .limit(@query.limit)
+        .offset(@query.offset)
+        .left_joins(@joins)
 
       if @pivots.empty? || results.empty?
         @table.cols = @table.cols[0 ... @max_before_pivot_columns] if @pivots.present?
@@ -381,13 +381,14 @@ def column_value(col, value)
       when :boolean
         value == 1 || value == '1' ? true : false
       when :date
-        value = Time.parse(value).to_date if value.is_a? String
+        value = Time.zone.parse(value).to_date if value.is_a? String
         RgvizRails::date(value)
       when :datetime
-        value = Time.parse(value) if value.is_a? String
+        value = Time.zone.parse(value) if value.is_a? String
         RgvizRails::datetime(value)
       when :timeofday
-        value = Time.parse(value) if value.is_a? String
+        value = Time.zone.parse(value) if value.is_a? String
+        puts RgvizRails::time_of_day(value)
         RgvizRails::time_of_day(value)
       else
         value.to_s

lib/rgviz_rails/init.rb

@@ -68,7 +68,8 @@ def render_with_rgviz(*args, &block)
           render_without_rgviz *args, &block
         end
       end
-      alias_method_chain :render, :rgviz
+       alias_method :render_without_rgviz, :render
+       alias_method :render, :render_with_rgviz
     end
   end
 end

rgviz-rails.gemspec

@@ -1,32 +1,32 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+# stub: rgviz-rails 1.0.0 ruby lib
 
-require "rgviz_rails/version"
+Gem::Specification.new do |s|
+  s.name = "rgviz-rails".freeze
+  s.version = "2.0.0"
 
-spec = Gem::Specification.new do |s|
-  s.name = "rgviz-rails"
-  s.version = RgvizRails::VERSION
-  s.author = "Ary Borenszweig"
-  s.email = "[email protected]"
-  s.homepage = "http://github.com/asterite/rgviz-rails"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "rgviz for rails"
-  s.files = [
-    "lib/rgviz_rails.rb",
-    "lib/rgviz_rails/executor.rb",
-    "lib/rgviz_rails/js_renderer.rb",
-    "lib/rgviz_rails/parser.rb",
-    "lib/rgviz_rails/tqx.rb",
-    "lib/rgviz_rails/view_helper.rb",
-    "lib/rgviz_rails/adapters/mysql_adapter.rb",
-    "lib/rgviz_rails/adapters/postgresql_adapter.rb",
-    "lib/rgviz_rails/adapters/sqlite_adapter.rb",
-    "lib/rgviz_rails/init.rb",
-    "rails/init.rb"
-  ]
-  s.add_dependency "rgviz", ">=0.50"
-  s.add_dependency "rails"
-  s.require_path = "lib"
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README.markdown"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Ary Borenszweig".freeze]
+  s.date = "2023-02-06"
+  s.email = "[email protected]".freeze
+  s.extra_rdoc_files = ["README.markdown".freeze]
+  s.files = ["README.markdown".freeze, "lib/rgviz_rails.rb".freeze, "lib/rgviz_rails/adapters/mysql_adapter.rb".freeze, "lib/rgviz_rails/adapters/postgresql_adapter.rb".freeze, "lib/rgviz_rails/adapters/sqlite_adapter.rb".freeze, "lib/rgviz_rails/executor.rb".freeze, "lib/rgviz_rails/init.rb".freeze, "lib/rgviz_rails/js_renderer.rb".freeze, "lib/rgviz_rails/parser.rb".freeze, "lib/rgviz_rails/tqx.rb".freeze, "lib/rgviz_rails/view_helper.rb".freeze, "rails/init.rb".freeze]
+  s.homepage = "http://github.com/asterite/rgviz-rails".freeze
+  s.rubygems_version = "3.3.26".freeze
+  s.summary = "rgviz for rails".freeze
+
+  s.installed_by_version = "3.3.26" if s.respond_to? :installed_by_version
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<rgviz>.freeze, [">= 0.50"])
+    s.add_runtime_dependency(%q<rails>.freeze, [">= 0"])
+  else
+    s.add_dependency(%q<rgviz>.freeze, [">= 0.50"])
+    s.add_dependency(%q<rails>.freeze, [">= 0"])
+  end
 end

spec/blueprints.rb

@@ -1,25 +1,22 @@
 require 'machinist/active_record'
-require 'sham'
 require 'faker'
 
-Sham.define do
-  name { Faker::Name.name }
-  number(:unique => false) { rand(100) + 1 }
-  date { Date.parse("#{rand(40) + 1970}-#{rand(12) + 1}-#{rand(28) + 1}") }
-end
+name  = Faker::Name.name
+number = rand(100) + 1
+date =  Date.parse("#{rand(40) + 1970}-#{rand(12) + 1}-#{rand(28) + 1}")
 
 City.blueprint do
-  name
+  name {name}
   country
 end
 
 Country.blueprint do
-  name
+  name {name}
 end
 
 Person.blueprint do
-  name
-  age { Sham::number }
-  birthday { Sham::date }
+  name {name}
+  age {number}
+  birthday {date}
   city
 end