datamapper-shim 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2FkOTYxYjMxMzI5NThhMWZjMWJhNjUzYjgzY2ZlM2QwZGFlNWY4OQ==
-  data.tar.gz: !binary |-
-    YzVjNzhjZGE4YjcwY2RlYjI4MjY5M2MwMTk3MzgzMjBlYTJjZDZjYw==
+SHA1:
+  metadata.gz: 1bf69a61204014eab511cfeee3c830bb3c0281ed
+  data.tar.gz: 001ab4ad3e0936eb68587b0fee6e92c4794fd4fb
 SHA512:
-  metadata.gz: !binary |-
-    NGU4NzVhNzViY2MzMzIwYTUzOGFiMDM3MTQ4ZTM5N2RjN2M5YTgwNGYwM2Q4
-    NjljMWUzMmJkY2Q0NzkzYmMxYjBlMWIzYmZjYjAwMTBiYWViN2NjNmM1OGZh
-    ZDQ5NWJhM2E2ZjE5NmY0Y2RkZmM2Yjg4YjZkM2UyMDU3MWIyMjY=
-  data.tar.gz: !binary |-
-    ZDUzMjAxODNkYmFjOTU0ZjU1NzQzYjJmNmUxZGI4YTBjNWM0NDg2ODMzY2U4
-    N2Y0YWE2OTU4ZjlkZGFhNjYyYmQ2NDFlMTQxNGY2NmZlODc4MzhiMTBlMTYx
-    ZjE0ZDEyOWM4NDY0ZDA4ZDdkZGM4NjI2NjYxMTgxOTFhNDRhOWU=
+  metadata.gz: 46fd21e261778d3a0866912f913c41fd734ba10b18267824264baf153258bb20c469ecc551d89f1d5b685e320060e7986e9411e5715cee17b5d1aa92eafb5bb3
+  data.tar.gz: ae2d15bd7a47cab1c42a172440d5954f80e4fb3aa2673515c5fe986e9de22fe1d39695a447d4f7941b124ddb8626486d2b3198ca4b2e8567c2788d76524ce5f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datamapper-shim (0.0.3)
+    datamapper-shim (0.0.4)
       activerecord (~> 3.2.0)
       composite_primary_keys (~> 5.0.0)
       json (~> 1.4)
@@ -9,27 +9,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.17)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
     builder (3.0.4)
     coderay (1.1.0)
-    composite_primary_keys (5.0.13)
+    composite_primary_keys (5.0.14)
       activerecord (~> 3.2.0, >= 3.2.9)
-    i18n (0.6.9)
-    json (1.8.1)
+    i18n (0.7.0)
+    json (1.8.3)
     method_source (0.8.2)
     minitest (5.2.3)
-    multi_json (1.8.4)
+    multi_json (1.11.1)
     pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -37,7 +37,7 @@ GEM
     rake (10.1.1)
     slop (3.4.7)
     sqlite3 (1.3.8)
-    tzinfo (0.3.38)
+    tzinfo (0.3.44)
 
 PLATFORMS
   ruby

data/datamapper-shim.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "datamapper-shim"
-  spec.version       = "0.0.4"
-  spec.authors       = ["ecin"]
-  spec.email         = ["ecin@copypastel.com"]
+  spec.version       = "0.0.5"
+  spec.authors       = ["ecin", "gblazer"]
+  spec.email         = ["ecin@copypastel.com", "gblazer@gmail.com"]
   spec.description   = "Dress ActiveRecord models in DataMapper robes"
   spec.summary       = "Migrate DataMapper models to ActiveRecord"
   spec.homepage      = "https://github.com/typekit/datamapper-shim"

data/lib/data_mapper/shim.rb

@@ -217,7 +217,7 @@ module DataMapper
           # Note, we don't define this on ActiveRecord::Relation
           def self.where(opts, *rest)
             @__datamapper_shim_enums.each do |name, enum|
-              if opts.has_key?(name) && !opts[name].is_a?(Integer)
+              if opts.is_a?(Hash) && opts.has_key?(name) && !opts[name].is_a?(Integer)
                 opts[name] = enum[opts[name]]
               end
             end

data/test/data_mapper/shim_test.rb

@@ -553,6 +553,16 @@ describe DataMapper::Shim do
       Typecaster.first.enum.must_equal :active
     end
 
+    it "can query using regular sql" do
+      @typecaster.enum = :pending
+      @typecaster.list = 'test'
+      @typecaster.save
+
+      Typecaster.where("enum = 1 AND list = 'test'").first.must_equal @typecaster
+      Typecaster.first.enum.must_equal :pending
+      Typecaster.first.list.first.must_equal "test"
+    end
+
     it "can typecast booleans" do
       @typecaster.boolean = 0
       @typecaster.boolean.must_equal false

metadata

@@ -1,130 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: datamapper-shim
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ecin
+- gblazer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: composite_primary_keys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12.4
 description: Dress ActiveRecord models in DataMapper robes
 email:
 - ecin@copypastel.com
+- gblazer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -145,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Migrate DataMapper models to ActiveRecord