embark-journey 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e7a47883c9d0a23ab06dd8690f8a2ad9cf9811
-  data.tar.gz: 550ccd3b424608792f87daa3b7277a828a443005
+  metadata.gz: 2b77138254b5e0798166326dbc1c358ef737030d
+  data.tar.gz: 004fb01ba67f78d0ff4a105c42c7e74f945fb048
 SHA512:
-  metadata.gz: 40df328dcace9a9d751fd69e01062cc295586be55a1c1efd2a6d30f4c4d27cfa3c4cec44820cb89b685ab7051c1a62e0354e53324de9930462e1fb146e93ad33
-  data.tar.gz: 4abe2a0b4861a465a841309eba0c073886a8b38af9b3fcccf28befb845bc009848d98a325c9e8cbe8efb6c8b2675b3ef54cd8c25f3deaa3d51b87722f5d0fc6a
+  metadata.gz: 1c716e4eaa31dc97d3e7fb4580279d1e51dea714e4ba7d1f670d34e52e7d55b8f9f693d902c91123f06ba7a7dccba192eb7ddf8c35b222d51cf090787c981e55
+  data.tar.gz: 44ab1288bc9095847d84438a16a4bff6c182df9e3eacad06cef241423c6d99c58212b33cf8dcc1b83082f5466ad9db8b2f12e6cf37f5aa2a3acac73a20e6896c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.0.15
+- added compatibility around enum_sets from Journey (using indices rather than text values)
+
 v0.0.14
 - some sugar around enum_sets
 

data/lib/journey/resource/enum_sets.rb

@@ -12,16 +12,29 @@ module Journey::Resource::EnumSets
       end
 
       define_method attr do
-        value = attributes[attr.to_s].presence
-        value.presence || []
+        arr = attributes[attr.to_s].presence || []
+        arr.map do |member|
+          if member.is_a?(Fixnum)
+            self.class.const_get(collection_const_name)[member]
+          else
+            member
+          end
+        end
       end
 
       define_method "add_#{attr}" do |value|
-        new_value = value.presence
-        if send("#{attr}_values").include? new_value
-          (attributes[attr.to_s] ||= []) << new_value
+        attr_values = send("#{attr}_values")
+
+        value_index = if value.is_a?(Fixnum)
+          value
+        else
+          attr_values.index(value)
+        end
+
+        if (0..attr_values.size-1).include? value_index
+          (attributes[attr.to_s] ||= []) << value_index
         else
-          raise "Invalid enum '#{new_value}' for '#{attr}'"
+          raise "Invalid enum '#{value}' for '#{attr}'"
         end
       end
     end

data/lib/journey/resource/enums.rb

@@ -14,7 +14,7 @@ module Journey::Resource::Enums
       instance_eval do
         attr_accessor :"#{attr}_index"
       end
-      
+
       define_method attr do
         value = attributes[attr.to_s].presence
         if value.is_a?(Fixnum)
@@ -23,7 +23,7 @@ module Journey::Resource::Enums
           value
         end
       end
-      
+
       define_method "#{attr}=" do |value|
         attributes[attr.to_s] = value.presence
       end

data/lib/journey/version.rb

@@ -2,7 +2,7 @@ module Journey
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 14
+    TINY  = 15
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/models/journey/resource_spec.rb

@@ -96,6 +96,11 @@ describe Journey::Resource do
         expect(r.asset_type).to eq []
       end
 
+      it 'converts integer indices to corresponding keys' do
+        r = klass.create(name: 'X', asset_type: [0])
+        expect(r.asset_type).to eq [klass::ASSET_TYPES.first]
+      end
+
       it 'safely adds members' do
         r = klass.create(name: 'X', asset_type: nil)
         r = klass.find(r.id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr