sunstone 5.0.1.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff6dca76dfaa5922dd16a451f32f8ab27d8a4ce
-  data.tar.gz: 82dcd2022fb893e8f764e0ef032eedac6d1b8762
+  metadata.gz: 76178cd8049c5ecd168c637aa48c27118df5d9c4
+  data.tar.gz: 5e5f760949bb9cb27ccea262c5b4c7123ff9fd13
 SHA512:
-  metadata.gz: 56c8135fad00fc2739483afdaa76eab3cf1b2fc494ffe9ee6ec83654021d8e1dd83fc51aaca35df5a505c8204c7c6bfc5aad259741034f25f66b2290616ff8d7
-  data.tar.gz: 6d9549f7854ef738858b49ee53650920a1dc2c49b86ca9a69967b53edc5505e3c240babcb41f0dbc06574e55b8acfc63d4a6875a671e490dd9c204d0bfdd863e
+  metadata.gz: 185c9b5258d7c28a6f6224eb733483bab0e3a1ceeb92a61779c5923a1495a9a45b2fb27fb5fbce9733d5ce7a101d1ac753830c1e8fc59a738db54adc4e2b3248
+  data.tar.gz: e2e93bd51ba9a0d32d5f5e8acc6ed766a1f0ed1d9ef1b3d7df1fe5cd1ff37dc8772302c8e2d0823adcf0bd100911990583be25ad260efbeb5373dfa37b1af7c5

data/.travis.yml

@@ -1,43 +1,55 @@
 language: ruby
-
-rvm:
-  - 2.3.1
-  - 2.4.0
-
-env:
-  - RAILS_VERSION=v5.0.0
-  - RAILS_VERSION=v5.0.0.1
-  - RAILS_VERSION=v5.0.1
+sudo: false
 
 cache:
   bundler: true
   directories:
     - /home/travis/.rvm/gems
 
+rvm:
+  - 2.4.1
+
+env:
+  matrix:
+    - RAILS_VERSION=v5.1.0 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.0 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.0 GEM=ar:postgresql
+    - RAILS_VERSION=v5.1.1 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.1 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.1 GEM=ar:postgresql
+    - RAILS_VERSION=v5.1.2 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.2 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.2 GEM=ar:postgresql
+    - RAILS_VERSION=v5.1.3 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.3 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.3 GEM=ar:postgresql
+
 addons:
   postgresql: "9.4"
 
 before_install:
   - unset BUNDLE_GEMFILE
+  - gem update --system
+  - gem update bundler
 
 install:
-  - git clone https://github.com/rails/rails.git ~/build/rails
+  - git clone --branch $RAILS_VERSION https://github.com/rails/rails.git ~/build/rails
 
 before_script:
+  - sed -i "s/t.warning = true/t.warning = false/g" Rakefile
   - pushd ~/build/rails
-  - git checkout $RAILS_VERSION
+  - git status
+  - sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/build/rails/activerecord/Rakefile
+  - sed -i "s/t.warning = true/t.warning = false/g" ~/build/rails/activerecord/Rakefile
   - sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\('~\/build\/malomalo\/sunstone\/lib'\)\)\nrequire 'sunstone'" ~/build/rails/activerecord/test/cases/helper.rb
   - cat ~/build/rails/Gemfile
-  - "sed -i \"/group :db do/a gem 'sunstone', path: File.expand_path\\('~\\/build\\/malomalo\\/sunstone'\\)\" ~/build/rails/Gemfile"
+  - rm ~/build/rails/Gemfile.lock
+  - "sed -i \"/# Active Record./a gem 'sunstone', path: File.expand_path\\('~\\/build\\/malomalo\\/sunstone'\\)\" ~/build/rails/Gemfile"
   - cat ~/build/rails/Gemfile
-  - bundle install --jobs=3 --retry=3
-  - createdb activerecord_unittest
-  - createdb activerecord_unittest2
-  - mysql -e "create database IF NOT EXISTS activerecord_unittest DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci;"
-  - mysql -e "create database IF NOT EXISTS activerecord_unittest2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci;"
-  - gem environment gempath
+  - bundle update --jobs=3 --retry=3
   - popd
   - bundle install --jobs=3 --retry=3
-  - gem environment gempath
 
-script: bundle exec rake test && cd ~/build/rails/activerecord && bundle exec rake test --verbose
+script:
+  - bundle exec rake test
+  - cd ~/build/rails && ci/travis.rb

data/ext/active_record/finder_methods.rb

@@ -28,7 +28,7 @@ module ActiveRecord
           end
           ka
         else
-          expand(key, value)
+          build(table.arel_attribute(key), value)
         end
       end
     end

data/ext/active_record/persistence.rb

@@ -75,6 +75,21 @@ module ActiveRecord
       end
     end
     
+    def _update_record(attribute_names = self.attribute_names)
+      attributes_values = arel_attributes_with_values_for_update(attribute_names)
+      if attributes_values.empty?
+        rows_affected = 0
+        @_trigger_update_callback = true
+      else
+        rows_affected = self.class.unscoped._update_record(attributes_values, id, id_in_database)
+        @_trigger_update_callback = (rows_affected.is_a?(ActiveRecord::Result) ? rows_affected.rows.size : rows_affected) > 0
+      end
+
+      yield(self) if block_given?
+
+      rows_affected
+    end
+    
     #!!!! TODO: I am duplicated from finder_methods.....
     def construct(parent, relations, seen, model_cache)
       relations.each do |key, attributes|

data/ext/active_record/relation.rb

@@ -4,49 +4,36 @@ module ActiveRecord
     def to_sql
       @to_sql ||= begin
         relation   = self
-        connection = klass.connection
-        visitor = if connection.visitor.is_a?(Arel::Visitors::Sunstone)
-          Arel::Visitors::ToSql.new(connection)
-        else
-          connection.visitor
-        end
-
+        
         if eager_loading?
           find_with_associations { |rel| relation = rel }
         end
 
-        binds = relation.bound_attributes
-        binds = connection.prepare_binds_for_database(binds)
-        binds.map! { |value| connection.quote(value) }
-        collect = visitor.accept(relation.arel.ast, Arel::Collectors::Bind.new)
-        collect.substitute_binds(binds).join
+        conn = klass.connection
+        conn.unprepared_statement {
+          conn.to_sql(relation.arel, relation.bound_attributes)
+        }
       end
     end
 
     def to_sar
       @to_sar ||= begin
         relation   = self
-        connection = klass.connection
-        visitor = if connection.visitor.is_a?(Arel::Visitors::ToSql)
-          Arel::Visitors::Sunstone.new(connection)
-        else
-          connection.visitor
-        end
-
+        
         if eager_loading?
           find_with_associations { |rel| relation = rel }
         end
 
-        binds = relation.bound_attributes
-        binds = connection.prepare_binds_for_database(binds)
-        binds.map! { |value| connection.quote(value) }
-        collect = visitor.accept(relation.arel.ast, Arel::Collectors::Sunstone.new)
-        collect.compile binds
+        conn = klass.connection
+        conn.unprepared_statement {
+          conn.to_sar(relation.arel, relation.bound_attributes)
+        }
       end
     end
 
     def _update_record(values, id, id_was) # :nodoc:
       substitutes, binds = substitute_values values
+      
       scope = @klass.unscoped
 
       if @klass.finder_needs_type_condition?

data/ext/active_record/statement_cache.rb

@@ -4,34 +4,29 @@ module ActiveRecord
 
       def initialize(values, sunstone=false)
         @values = values
-        if sunstone
-          @indexes = values.value.find_all { |thing|
+        @indexes = if sunstone
+          values.value.find_all { |thing|
             Arel::Nodes::BindParam === thing
           }
         else
-          @indexes = values.each_with_index.find_all { |thing,i|
+          values.each_with_index.find_all { |thing,i|
             Arel::Nodes::BindParam === thing
           }.map(&:last)
         end
       end
 
       def sql_for(binds, connection)
-        binds = connection.prepare_binds_for_database(binds)
+        casted_binds = binds.map(&:value_for_database)
         
         if connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
           @values.compile(binds)
         else
           val = @values.dup
-          @indexes.each { |i| val[i] = connection.quote(binds.shift) }
+          @indexes.each { |i| val[i] = connection.quote(casted_binds.shift) }
           val.join
         end
       end
-    end
 
-    def self.partial_query(visitor, ast, collector)
-      collected = visitor.accept(ast, collector)
-      collected = collected.value if !visitor.is_a?(Arel::Visitors::Sunstone)
-      PartialQuery.new(collected, visitor.is_a?(Arel::Visitors::Sunstone))
     end
 
   end

data/lib/active_record/connection_adapters/sunstone/database_statements.rb

@@ -1,8 +1,19 @@
+require "arel/collectors/sql_string"
+
 module ActiveRecord
   module ConnectionAdapters
     module Sunstone
       module DatabaseStatements
 
+        def to_sql(arel, binds = [])
+          if arel.respond_to?(:ast)
+            collected = Arel::Visitors::ToSql.new(self).accept(arel.ast, prepared_statements ? AbstractAdapter::SQLString.new : AbstractAdapter::BindCollector.new)
+            collected.compile(binds, self).freeze
+          else
+            arel.dup.freeze
+          end
+        end
+        
         # Converts an arel AST to a Sunstone API Request
         def to_sar(arel, bvs = [])
           if arel.respond_to?(:ast)
@@ -12,10 +23,22 @@ module ActiveRecord
             arel
           end
         end
+        
+        def cacheable_query(klass, arel) # :nodoc:
+          collected = visitor.accept(arel.ast, collector)
+          if prepared_statements
+            klass.query(collected.value)
+          else
+            if self.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
+              StatementCache::PartialQuery.new(collected, true)
+            else
+              StatementCache::PartialQuery.new(collected.value, false)
+            end
+          end
+        end
 
         # Returns an ActiveRecord::Result instance.
         def select_all(arel, name = nil, binds = [], preparable: nil)
-
           arel, binds = binds_from_relation arel, binds
           select(arel, name, binds)
         end
@@ -69,7 +92,7 @@ module ActiveRecord
           else
             send_request.call(arel)
           end
-
+          
           if sars[0].instance_variable_defined?(:@sunstone_calculation) && sars[0].instance_variable_get(:@sunstone_calculation)
             # this is a count, min, max.... yea i know..
             ActiveRecord::Result.new(['all'], [result], {:all => type_map.lookup('integer')})
@@ -79,6 +102,19 @@ module ActiveRecord
             ActiveRecord::Result.new(result.keys, [result])
           end
         end
+        
+        def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+          value = exec_insert(arel, name, binds, pk, sequence_name)
+          id_value || last_inserted_id(value)
+        end
+        
+        def update(arel, name = nil, binds = [])
+          exec_update(arel, name, binds)
+        end
+        
+        def delete(arel, name = nil, binds = [])
+          exec_delete(arel, name, binds)
+        end
 
         def last_inserted_id(result)
           row = result.rows.first

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -103,7 +103,7 @@ module ActiveRecord
       
       # Executes the delete statement and returns the number of rows affected.
       def delete(arel, name = nil, binds = [])
-        r = exec_delete(to_sql(arel, binds), name, binds)
+        r = exec_delete(arel, name, binds)
         r.rows.first.to_i
       end
 
@@ -173,8 +173,8 @@ module ActiveRecord
       # If the next id was calculated in advance (as in Oracle), it should be
       # passed in as +id_value+.
       def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-        sql, binds, pk, sequence_name = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
-        value = exec_insert(sql, name, binds, pk, sequence_name)
+        sql, binds, pk, sequence_name = sql_for_insert(arel, pk, id_value, sequence_name, binds)
+        exec_insert(sql, name, binds, pk, sequence_name)
       end
       alias create insert
       

data/lib/arel/visitors/sunstone.rb

@@ -1004,7 +1004,7 @@ module Arel
       # end
 
       def inject_join list, collector, join_str
-        list.each_with_index.inject([]) { |c, (x,i)|
+        list.each_with_index.inject([]) { |c, (x,_)|
           c + [visit(x, collector)]
         }
       end

data/lib/sunstone/connection.rb

@@ -128,7 +128,7 @@ module Sunstone
         elsif Thread.current[:sunstone_request_sent]
           log_mess = request.path.split('?', 2)
           log_mess += Thread.current[:sunstone_request_sent].path.split('?', 2)
-          raise <<~MSG
+          raise ActiveRecord::StatementInvalid, <<~MSG
             Cannot send multiple request in a transaction.
             
             Trying to send:
@@ -139,7 +139,7 @@ module Sunstone
           MSG
         else
           log_mess = request.path.split('?', 2)
-          raise <<~MSG
+          raise ActiveRecord::StatementInvalid, <<~MSG
             Cannot send multiple request in a transaction.
             
             Trying to send:

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.1.4'
+  VERSION = '5.1.0'
 end

data/sunstone.gemspec

@@ -29,11 +29,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'activesupport', '~> 5.0.1'
+  s.add_development_dependency 'activesupport', '~> 5.1.0'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'arel', '~> 7.0'
-  s.add_runtime_dependency 'activerecord', '~> 5.0.1'
+  s.add_runtime_dependency 'activerecord', '~> 5.1.0'
 end

data/test/active_record/query_test.rb

@@ -28,6 +28,16 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
 
     assert_nil Ship.first
   end
+  
+  test '::first!' do
+    webmock(:get, "/ships", { limit: 1, order: [{id: :asc}] }).to_return({
+      body: [].to_json
+    })
+
+    assert_raises ActiveRecord::RecordNotFound do
+      Ship.first!
+    end
+  end
 
   test '::last' do
     webmock(:get, "/ships", { limit: 1, order: [{id: :desc}] }).to_return({
@@ -94,13 +104,13 @@ class ActiveRecord::QueryTest < ActiveSupport::TestCase
   end
 
   test '#to_sar' do
-    assert_equal "/ships?%81%A5where%81%A2id%A210", Ship.where(:id => 10).to_sar.path
+    assert_equal "/ships?%81%A5where%81%A2id%0A", Ship.where(:id => 10).to_sar.path
   end
 
   test 'bind params get eaten when joining' do
     uri = URI(Ship.joins(:ownerships).where({ ownerships: { id: 1 } }).to_sar.path)
     query = MessagePack.unpack(CGI.unescape(uri.query))
-    assert_equal({"where"=>{"ownerships"=>{"id"=>{"eq"=>"1"}}}}, query)
+    assert_equal({"where"=>{"ownerships"=>{"id"=>{"eq"=>1}}}}, query)
   end
 
 end

data/test/test_helper.rb

@@ -68,7 +68,6 @@ class ActiveSupport::TestCase
     query = deep_transform_query(query) if query
 
     stub_request(method, /^#{ActiveRecord::Base.connection.instance_variable_get(:@connection).url}/).with do |req|
-    # puts "REQ\t#{unpack(req.uri.query.sub(/=true$/, ''))}" if req&.uri&.path == path && req.uri.query
       if query
         req&.uri&.path == path && req.uri.query && unpack(req.uri.query.sub(/=true$/, '')) == query
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 5.0.1.4
+  version: 5.1.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -220,34 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -261,7 +247,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile.rb
+- Rakefile
 - TODO.md
 - ext/active_record/associations.rb
 - ext/active_record/associations/association.rb
@@ -337,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A library for interacting with REST APIs