embark-journey 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4686df29e65a3ebc8fac2f42b1323cfa15ec0599
-  data.tar.gz: 4328300152c187737623cc8fd2d79bab78647bdb
+  metadata.gz: e3998c199ed52d9b9c1c18b8a232a3448588b039
+  data.tar.gz: 837e0d85bf8f77bc7dac887f43143ff38580ef8d
 SHA512:
-  metadata.gz: 3eb44d831384d966eac83eea6a56bb3ce96bddd37a9aca8c6c91fdfc210eeb27e74aee166b5ddda1755b38609ca04171105677c7688ee44641cca12b3a1e87bf
-  data.tar.gz: 6f1d3487bfdbdcd3ed5410a78a280159843a81e09730b69dba21d1c30a7c9d7faf0ad30f3a2fbc34ae98a4bdf19771813fccbec04ca064c5a2fb682b66a7873e
+  metadata.gz: 50afca97c3f70db7b65c98599441f5c7566e051511a39771228dde204e3c26b08ddb82bea5dc852a75a17e9069597a5a7b0d9c6fd4b2eecd438b4aa708d5ab5e
+  data.tar.gz: 77efa8e28f9da152bdcccea89fd400df1cd15f1f1687901aa7528cd6c67cafe7e77f5c1b3d1b9415fbfa0e167b640c1f1df743bc158c683c888b960d58a51670

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format documentation

data/lib/journey/resource/attribute_loading.rb

@@ -7,9 +7,18 @@ module Journey::Resource::AttributeLoading
     def load(attributes, remove_root = false, persisted = false)
       # 'data' is a reserved key in ActiveResource,
       # but Journey uses it for the Oplog
-
       attributes['content'] = attributes.delete('data')
-      super(attributes, remove_root, persisted)
+
+      super(attributes, remove_root, persisted).tap do
+
+        # allow enum_sets to be loaded by key (rather than index)
+        # by auto-converting them on initialization
+        if enum_sets = self.class.instance_variable_get(:@enum_sets)
+          enum_sets.each do |enum_attr|
+            send("#{enum_attr}=", send(enum_attr))
+          end
+        end
+      end
     end
   end
 

data/lib/journey/resource/enum_sets.rb

@@ -5,8 +5,11 @@ module Journey::Resource::EnumSets
 
   included do
     def self.enum_set(attr, collection=[])
+      (@enum_sets ||= []) << attr
+
       collection_const_name = attr.to_s.pluralize.upcase.to_sym
-      const_set collection_const_name, collection.freeze      
+      const_set collection_const_name, collection.freeze
+
       define_method "#{attr}_values" do
         self.class.const_get(collection_const_name)
       end
@@ -22,6 +25,16 @@ module Journey::Resource::EnumSets
         end
       end
 
+      define_method "#{attr}=" do |value|
+        attributes[attr.to_s] = value.map do |member|
+          if member.is_a?(Fixnum)
+            member
+          else
+            self.class.const_get(collection_const_name).index(member)
+          end
+        end 
+      end
+
       define_method "add_#{attr}" do |value|
         attr_values = send("#{attr}_values")
 
@@ -34,7 +47,7 @@ module Journey::Resource::EnumSets
         if (0..attr_values.size-1).include? value_index
           (attributes[attr.to_s] ||= []) << value_index
         else
-          raise "Invalid enum '#{value}' for '#{attr}'"
+          raise "Invalid enum_set value: '#{value}' for '#{attr}'"
         end
       end
     end

data/lib/journey/resource/search.rb

@@ -4,7 +4,7 @@ module Journey::Resource::Search
   extend ActiveSupport::Concern
 
   included do
-    def self.search(q)
+    def self.search(q) # TODO add opts here
       instantiate_collection format.decode(post(:search, q: q).body)
     end
   end

data/lib/journey/version.rb

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

data/spec/models/journey/resource_spec.rb

@@ -80,15 +80,16 @@ describe Journey::Resource do
         r = klass.create(name: 'X')
         expect(r).to be_persisted
         r.asset_type = ['ATM']
-        r.save
+        expect(r.save).to be true
+
         r = klass.find(r.id)
-        expect(r.asset_type).to eq(['ATM'])
+        expect(r.asset_type).to eq ['ATM']
       end
 
-      it 'remembers enum values' do
-        r = klass.create(name: 'X', asset_type: ['ATM', 'ABM'])
+      it 'remembers enum_set values' do
+        r = klass.create(name: 'X', asset_type: ['ABM', 'ATM'])
         r = klass.find(r.id)
-        expect(r.asset_type).to eq ['ATM', 'ABM']
+        expect(r.asset_type).to eq ['ABM', 'ATM']
       end
 
       it 'defaults to empty array' do

metadata

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