hashme 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1045fc4e1ba0066c1dc069227476c81eb697a28b
-  data.tar.gz: f2229e7dfec9140a71e2e60ec201c02ff2d81497
+  metadata.gz: 2663088632661682c045a62e2674257dd342c568
+  data.tar.gz: 24af504823c262c52ab5c951ecceb8fa17a8f2ec
 SHA512:
-  metadata.gz: cef47c70a5dcd7e9f3c360dffa448511f5e37f8ddcef739e0c369fffb9a7684c83a8f7a127881b0a7b9b4a3d40c5bf1ec216a67d20ce4d43090c93074bad1b44
-  data.tar.gz: 18662edc598e7d312c5873c26d02e321841a47712ae712ab458c41db0277919e5789eb507654d7e994639e12e41cac5f349f333fbfe40aa104e53c43fa133412
+  metadata.gz: ffec5164dd1d0920674d067e1b1c1c354ed6db3333a0c003850f4cf847ef564ef236e0516c698f15d82f36ea8e167ff5f3d4f67c4126e633df080e4f0248df50
+  data.tar.gz: 99637e30e2c635a4955c3f461eef856bd8d1ace88619eab3f83aa0e3d9705b6495248add82ba9fc7a9e1230cb29cdec76d894e0757dba655c71932bf6eda1678

data/README.md

@@ -6,7 +6,7 @@ Hashme helps you create simple models that allow you to initialize and
 generate hashes that you can serialize and store as you wish.
 
 Its a bit like ActiveRecord, but without all the messy database stuff,
-and of course you can nest to you're hearts content.
+and of course you can nest to you're heart's content.
 
 ## Installation
 
@@ -89,6 +89,11 @@ kennel.cats.length == 2    # true!
 
 ## History
 
+### 0.1.2 - 2014-03-10
+
+ * Set default property values on object initialization.
+ * Refactoring to use `class_atrribute` for properties hash for improved inheritance.
+
 ### 0.1.1 - 2014-01-21
  
  * Fixing dependency on ActiveModel >= 3.0

data/lib/hashme.rb

@@ -30,7 +30,8 @@ module Hashme
   end
 
   def initialize(attrs = {})
-    # Use the `Properties` module's `#set_attribtues` method
+    # Use the `Properties` module's methods
+    set_defaults
     set_attributes(attrs)
   end
 

data/lib/hashme/properties.rb

@@ -2,6 +2,11 @@ module Hashme
   module Properties
     extend ActiveSupport::Concern
 
+    included do
+      class_attribute :properties
+      self.properties = {}
+    end
+
     def get_attribute(name)
       self[name]
     end
@@ -17,6 +22,15 @@ module Hashme
 
     protected
 
+    # Go through each property and make sure it has a default value.
+    def set_defaults
+      (self.class.properties || {}).each do |key, property|
+        unless property.default.nil?
+          self[property.name] = property.default
+        end
+      end
+    end
+
     # Internal method to go through each attribute and set the
     # values via the set_attribute method.
     def set_attributes(attrs = {})
@@ -28,37 +42,19 @@ module Hashme
     private
     
     def get_property(name)
-      # not only search in the class, search in the superclass too if the superclass can respond to properties[]. Using a class method for this
-      self.class.search_property(name)
+      self.class.properties[name.to_sym]
     end
 
     module ClassMethods
 
-      attr_accessor :properties
-
       def property(*args)
-        self.properties ||= {}
-
         # Prepare the property object and methods
         property = Property.new(*args)
-        properties[property.name] = property
+        self.properties = properties.merge(property.name => property)
         define_property_methods(property)
 
         property
       end
-      
-      # Recursive search the property in the superclass chain
-      def search_property(name)        
-        name = name.to_sym
-        
-        if properties[name]
-          properties[name]
-        elsif superclass.respond_to?(:search_property)
-          superclass.search_property(name)
-        else
-          nil
-        end
-      end
 
       protected
 

data/lib/hashme/version.rb

@@ -1,3 +1,3 @@
 module Hashme
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/hashme/base_spec.rb

@@ -32,6 +32,13 @@ describe Hashme do
       @obj.name.should eql("Sam")
     end
 
+    it "should set default values so they are accessible by hash" do
+      @model.property :surname, String, :default => "Nowl"
+      @obj = @model.new
+      @obj.to_hash[:surname].should eql('Nowl')
+    end
+
+
   end
 
 end

data/spec/hashme/properties_spec.rb

@@ -51,11 +51,21 @@ describe Hashme::Properties do
       @model.properties.class.should eql(Hash)
     end
 
-    it "should be null if no properties" do
+    it "should be empty if no properties" do
       model = Class.new do
         include Hashme
       end
-      model.properties.should be_nil
+      model.properties.should be_empty
+    end
+
+    it "should be inherited from parent models" do
+      mod = Class.new(@model) do
+        property :surname, String
+      end
+      mod.properties.keys.should include(:name)
+      mod.properties.keys.should include(:surname)
+      # Make sure we don't update the parent!
+      @model.properties.keys.should_not include(:surname)
     end
 
   end
@@ -97,5 +107,4 @@ describe Hashme::Properties do
 
   end
 
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashme
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel