praxis-mapper 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb0361a7b29be6d0c9d393bf149369d22cfacd1
-  data.tar.gz: f86867db4ccfdd60992aab8cc66cf8959362c7ec
+  metadata.gz: 71bd06fa8f2c3ff667aef12cf116a714c17c76fa
+  data.tar.gz: 3ab68cf2cdf25df7fe6ba341a459b3c0047fc1e1
 SHA512:
-  metadata.gz: 13f27e05d0c46b6ed3b906af2fbee4e05425530354ee873eba1097beeacb4df74955b9aa05e064f1ce1165fdda9f72b74beb4c5759454c4493d086c9ffea98d6
-  data.tar.gz: 697c2552d6c1b898df1d77e61e164f844d89361f66a5647ccac2005e745e7ccf7bc7d06acfaf066700d00e19af1f771ed8512f79672e786d0c90fdb9b023dbcb
+  metadata.gz: 19cb0ef80ba71a29fc8674ed6278cdc3c9e3336504698117818e3c856a3fb1e0cdfa5b5f4c4850e84c95cda2ed57a204b99709fc7113b9f3e0dfbe68a57e191a
+  data.tar.gz: 66b34d0b5c243c2ac1f092f041bc68995bc5a200b30d3e0ad3ed269213108548b8e5ce7947eaeb46f327be443fd5c0b76045467e70c58da1d95e9ecce10aa5ec

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## next
 
-* Next feature description here 
+* Next feature or fix here.
+
+## 3.1.2
+
+* Fixed handling of loads where :staged, which could cause an incorrect underlying query using a "staged" column.
+* Relaxed ActiveSupport version dependency from 4 to >=3
 
 ## 3.1
 

data/README.md

@@ -1,4 +1,8 @@
-# Praxis::Mapper
+# Praxis::Mapper [![TravisCI][travis-img-url]][travis-ci-url] 
+
+[travis-img-url]:https://travis-ci.org/rightscale/praxis-mapper.svg?branch=master
+[travis-ci-url]:https://travis-ci.org/rightscale/praxis-mapper
+
 
 Praxis::Mapper is a library that allows for large amounts of data to be loaded for a tree of associated models,
 while minimizing requests to external services.

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler/setup'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 desc "Run RSpec code examples with simplecov"
 RSpec::Core::RakeTask.new do |spec|

data/lib/praxis-mapper/identity_map.rb

@@ -113,7 +113,10 @@ module Praxis::Mapper
       query_class = @connection_manager.repository(model.repository_name)[:query]
       query = query_class.new(self, model, &block)
 
-      return finalize_model!(model, query) if query.where == :staged
+      if query.where == :staged
+        query.where = nil
+        return finalize_model!(model, query)
+      end
 
       records = query.execute
       add_records(records)

data/lib/praxis-mapper/version.rb

@@ -1,5 +1,5 @@
 module Praxis
   module Mapper
-    VERSION = "3.1.1"
+    VERSION = "3.1.2"
   end
 end

data/praxis-mapper.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency(%q<randexp>, ["~> 0"])
   spec.add_runtime_dependency(%q<sequel>, ["~> 4"])
-  spec.add_runtime_dependency(%q<activesupport>, ["~> 4"])
+  spec.add_runtime_dependency(%q<activesupport>, [">= 3"])
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0"

data/spec/praxis-mapper/identity_map_spec.rb

@@ -108,6 +108,25 @@ describe Praxis::Mapper::IdentityMap do
 
     end
 
+    context 'where :staged' do
+      after do
+        identity_map.load AddressModel do
+          where :staged
+          track :foobar
+        end
+      end
+      it 'calls finalize_model!' do
+        identity_map.should_receive(:finalize_model!).with(AddressModel, anything())
+      end
+      it 'removes the :staged from the query where clause' do
+        identity_map.should_receive(:finalize_model!) do |model, query|
+          model.should be(AddressModel)
+          query.where.should be(nil)
+          query.track.should eq(Set.new([:foobar])) 
+        end
+      end
+    end
+
     context 'with a query with a subload' do
       context 'for a many_to_one association' do
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-mapper
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -43,16 +43,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -277,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A multi-datastore library designed for efficiency in loading large datasets.

data/Gemfile.lock

@@ -1,102 +0,0 @@
-PATH
-  remote: .
-  specs:
-    praxis-mapper (3.1.0)
-      activesupport (~> 4)
-      randexp (~> 0)
-      sequel (~> 4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    byebug (2.7.0)
-      columnize (~> 0.3)
-      debugger-linecache (~> 1.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.3)
-    formatador (0.2.5)
-    fuubar (1.3.3)
-      rspec (>= 2.14.0, < 3.1.0)
-      ruby-progressbar (~> 1.4)
-    guard (2.6.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (4.3.1)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    i18n (0.6.11)
-    json (1.8.1)
-    listen (2.7.9)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    minitest (5.4.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (1.3.3)
-      byebug (~> 2.7)
-      pry (~> 0.10)
-    pry-stack_explorer (0.4.9.1)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    rake (0.9.6)
-    randexp (0.1.7)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby-progressbar (1.5.1)
-    sequel (4.13.0)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    timers (1.1.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    yard (0.8.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  fuubar (~> 1)
-  guard (~> 2)
-  guard-rspec
-  praxis-mapper!
-  pry (~> 0)
-  pry-byebug (~> 1)
-  pry-stack_explorer (~> 0)
-  rake (~> 0)
-  redcarpet (< 3.0)
-  rspec (< 2.99)
-  yard (~> 0.8.7)