no_integrity 0.4.0 → 0.5.0

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemfile
+gemspec

data/README.md

@@ -9,35 +9,52 @@ Simple hash serialization with loose type coercion.  Built for ActiveRecord mode
 For starters, throw this in your Gemfile:
 
     gem "no_integrity"
-    
+
 Then, add this to your class:
 
     class MrArbitrary < ActiveRecord::Base
       include NoIntegrity
-  
+
       attr_accessor :some_random_hash
-  
-      no_attr_store :some_random_hash
+
       no_attribute :misc
-      no_attribute :hair => 'String'
-      no_attribute :age => 'Integer'
-      no_attribute :height => 'String', :eyes => 'String', :friendly => 'Boolean'
-      no_attribute [:cheese, :ham, :balogne]
+      no_attribute :hair, type: 'String'
+      no_attribute :age, type: 'Integer'
+      no_attribute :height, type: 'String'
+      no_attribute :eyes, type: 'String'
+      no_attribute :friendly, type: 'Boolean', default: true
+      no_attribute :cheese
+      no_attribute :ham
+      no_attribute :balogne
     end
-    
+
 Finally, you can make calls like this:
 
     arbs = MrArbitrary.new
     arbs.friendly? # => false
     arbs.friendly = true
     arbs.friendly? # => true
-    
+
 You can define as many attributes as you want, and you can specify any of the following coercion types:
 
 1. `String`
 2. `Integer`
 3. `Boolean`
 
+## Upgrading From 0.4.0
+
+For `0.5.0` I added the ability to store default values for each of the attributes.  This required some changes to the way that attributes were setup and stored for each object.
+
+In your classes you'll need to convert from:
+
+    no_attribute hair: 'String'
+
+To:
+
+    no_attribute :hair, type: 'String'
+
+Also if you relied on any of the undocumented method calls, you'll need to update them so they can handle the new internal structure.
+
 ## Why?
 
 A while back, I needed serialized attributes but it either didn't work for my use case or it wasn't made yet.  So, I wrote this gem.

data/lib/no_integrity/no_integrity.rb

@@ -1,54 +1,48 @@
 module NoIntegrity
-  
+
   def self.included(a_module)
     a_module.module_eval do
       extend ClassMethods
     end
   end
-  
+
   module ClassMethods
     def no_attr_store(storage_attribute = nil)
       if storage_attribute && @no_attr_store.nil?
         alias_no_attr_store(storage_attribute)
         @no_attr_store = storage_attribute
       end
-      
+
       return @no_attr_store
     end
-    
+
     def no_attributes
       @no_attributes || { }
     end
-    
-    def no_attribute(options)
+
+    def no_attribute(attribs, options = { })
       @no_attributes ||= { }
-      if options.is_a?(Hash)
-        options.keys.each do |attrib|
-          @no_attributes[attrib] = options[attrib]
-          setup_no_attribute_accessors(attrib, options[attrib])
-          update_no_attribute_mappings(attrib, options[attrib])
-        end
-      elsif options.is_a?(Array)
-        options.each do |attrib|
-          @no_attributes[attrib] = nil
-          setup_no_attribute_accessors(attrib, nil)
-        end
-      elsif options.is_a?(Symbol)
-        setup_no_attribute_accessors(options)
+
+      attribs = [attribs] unless attribs.is_a?(Array)
+
+      attribs.each do |attrib|
+        @no_attributes[attrib.to_sym] = options
+        setup_no_attribute_accessors(attrib, options[:type])
+        update_no_attribute_mappings(attrib, options)
       end
     end
-    
+
     def no_attribute_mappings
       @no_attribute_mappings
     end
-    
+
     private
-    
-    def update_no_attribute_mappings(attrib, type)
+
+    def update_no_attribute_mappings(attrib, options)
       @no_attribute_mappings ||= { }
-      @no_attribute_mappings[attrib.to_s] = type
+      @no_attribute_mappings[attrib.to_sym] = options
     end
-    
+
     def setup_no_attribute_accessors(attrib, coercion_type = nil)
       module_eval <<-STR
         def #{attrib}; get_no_attribute('#{attrib}'); end
@@ -56,7 +50,7 @@ module NoIntegrity
         def #{attrib}=(v); set_no_attribute('#{attrib}', coerce_no_attribute_type(v, '#{coercion_type}')); end
       STR
     end
-    
+
     def alias_no_attr_store(old_name)
       module_eval <<-STR, __FILE__, __LINE__ + 1
         def __no_attr_store; self.#{old_name}; end
@@ -64,13 +58,17 @@ module NoIntegrity
         def __no_attr_store=(v); self.#{old_name} = v; end
       STR
     end
-    
+
   end
-  
+
   def no_attributes
     self.class.no_attributes
   end
-  
+
+  def no_attribute_mappings
+    self.class.no_attribute_mappings
+  end
+
   def update_no_attributes(new_attributes)
     raise "Type mismatch: I received a #{new_attributes.class} when I was expecting a Hash." unless new_attributes.is_a?(Hash)
     new_attributes.each do |key, value|
@@ -78,31 +76,33 @@ module NoIntegrity
     end
     return self.send(self.class.no_attr_store)
   end
-  
+
   private
-  
+
   def get_no_attribute(attribute_name)
     return nil unless self.__no_attr_store.is_a?(Hash)
     self.__no_attr_store = normalize_keys(__no_attr_store)
-    self.__no_attr_store[attribute_name.to_s]
+    no_val = self.__no_attr_store[attribute_name.to_sym]
+
+    no_val.nil? ? no_attribute_mappings[attribute_name.to_sym][:default] : no_val
   end
-    
+
   def set_no_attribute(attribute_name, value)
     self.__no_attr_store = normalize_keys(__no_attr_store)
     if self.__no_attr_store.is_a?(Hash)
-      self.__no_attr_store[attribute_name.to_s] = value
+      self.__no_attr_store[attribute_name.to_sym] = value
     else
-      self.__no_attr_store = { attribute_name.to_s => value }
+      self.__no_attr_store = { attribute_name.to_sym => value }
     end
   end
-  
+
   def normalize_keys(store)
     return store if @__performed_key_normalization || !store.is_a?(Hash)
-    store.keys.each { |key| store[key.to_s] = store.delete(key) }
+    store.keys.each { |key| store[key.to_sym] = store.delete(key) }
     @__performed_key_normalization = true
     return store
   end
-  
+
   def coerce_no_attribute_type(value, type)
     return value if (type == nil) || (type == '')
     value = case type
@@ -117,8 +117,8 @@ module NoIntegrity
     else
       raise "Unsure of what to do with #{type}!!"
     end
-    
+
     return value
   end
-  
+
 end

data/lib/no_integrity/version.rb

@@ -1,3 +1,3 @@
 module NoIntegrity
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/no_integrity.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  
-  gem.add_development_dependency(%q<rspec>, ["= 2.9.0"])
-  gem.add_development_dependency(%q<ZenTest>, ["= 4.5.0"])
+
+  gem.add_development_dependency(%q<rspec>, ["~> 3.4.0"])
 end

data/spec/no_integrity_spec.rb

@@ -5,12 +5,12 @@ describe NoIntegrity do
   context "class methods" do
 
     it "stores mappings of the various types of attributes" do
-      MrArbitrary.no_attribute_mappings['hair'].should == 'String'
-      MrArbitrary.no_attribute_mappings['friendly'].should == 'Boolean'
+      expect(MrArbitrary.no_attribute_mappings[:hair][:type]).to eq('String')
+      expect(MrArbitrary.no_attribute_mappings[:friendly][:type]).to eq('Boolean')
     end
 
   end
-  
+
   context "An object with NoIntegrity" do
 
     before(:each) do
@@ -21,97 +21,101 @@ describe NoIntegrity do
     end
 
     it "should know where the attributes are being stored" do
-      @arbs.class.no_attr_store.should be_an_instance_of Symbol
+      expect(@arbs.class.no_attr_store).to be_an_instance_of Symbol
     end
-    
+
     it "should be able to get all of the attributes" do
-      @arbs.__no_attr_store.should be_an_instance_of Hash
+      expect(@arbs.__no_attr_store).to be_an_instance_of Hash
     end
-    
+
     it "should be able to list the attributes it is familiar with" do
-      @arbs.no_attributes.should be_an_instance_of Hash
+      expect(@arbs.no_attributes).to be_an_instance_of Hash
     end
 
     it "should be able to retrieve attributes from the store" do
-      @arbs.hair.should == 'brown'
+      expect(@arbs.hair).to eq('brown')
     end
 
     it "should be able to have an attribute assigned" do
       @arbs.hair = "black"
-      @arbs.hair.should == 'black'
+      expect(@arbs.hair).to eq('black')
     end
-    
+
     it "should be able to mass assign attributes" do
       @arbs.update_no_attributes( :hair => 'blonde' )
-      @arbs.hair.should == 'blonde'
+      expect(@arbs.hair).to eq('blonde')
     end
-    
+
     it "should coerce boolean types" do
       @arbs.friendly = 1
-      @arbs.should be_friendly
-      @arbs.friendly.should == true
+      expect(@arbs).to be_friendly
+      expect(@arbs.friendly).to eq(true)
     end
-    
+
     it "should coerce interger types" do
       @arbs.age = "25"
-      @arbs.age.should == 25
+      expect(@arbs.age).to eq(25)
     end
-    
+
     it "should allow arbitrary types" do
       @arbs.misc = ['junk']
-      @arbs.misc.should == ['junk']
+      expect(@arbs.misc).to eq(['junk'])
     end
-    
+
     it "should allow for arrays of arbitary types" do
-      @arbs.no_attributes.keys.should include(:cheese)
-      @arbs.no_attributes.keys.should include(:ham)
-      @arbs.no_attributes.keys.should include(:balogne)
+      expect(@arbs.no_attributes.keys).to include(:cheese)
+      expect(@arbs.no_attributes.keys).to include(:ham)
+      expect(@arbs.no_attributes.keys).to include(:balogne)
     end
-    
+
     it "should allow for hashes of types" do
-      @arbs.no_attributes.keys.should include(:height)
-      @arbs.no_attributes.keys.should include(:eyes)
-      @arbs.no_attributes.keys.should include(:friendly)
+      expect(@arbs.no_attributes.keys).to include(:height)
+      expect(@arbs.no_attributes.keys).to include(:eyes)
+      expect(@arbs.no_attributes.keys).to include(:friendly)
     end
-    
+
     it "should coerce types on mass assignment" do
       @arbs.update_no_attributes(:age => "22")
-      @arbs.age.should == 22
+      expect(@arbs.age).to eq(22)
     end
-    
+
     it "should coerce booleans from numbers" do
       @arbs.friendly = "0"
-      @arbs.should_not be_friendly
+      expect(@arbs).not_to be_friendly
       @arbs.friendly = "1"
-      @arbs.should be_friendly
+      expect(@arbs).to be_friendly
     end
-    
+
     it "should coerce booleans from strings" do
       @arbs.friendly = "false"
-      @arbs.should_not be_friendly
+      expect(@arbs).not_to be_friendly
       @arbs.friendly = "true"
-      @arbs.should be_friendly
+      expect(@arbs).to be_friendly
     end
-    
+
     it "should not allow mass assignment of attributes if they are not in a hash" do
-      lambda { @arbs.update_no_attributes("monkey") }.should raise_exception("Type mismatch: I received a String when I was expecting a Hash.")
+      expect { @arbs.update_no_attributes("monkey") }.to raise_exception("Type mismatch: I received a String when I was expecting a Hash.")
     end
-    
+
     it "should return nil for every attribute if the store is not a hash" do
       @arbs.some_random_hash = nil
-      @arbs.hair.should be_nil
+      expect(@arbs.hair).to be_nil
     end
-    
+
     it "should set the store to a hash when setting an attribute" do
       @arbs.some_random_hash = "POTATO"
       @arbs.eyes = 'red'
-      @arbs.eyes.should == 'red'
+      expect(@arbs.eyes).to eq('red')
     end
-    
+
     it "should return an empty hash if there are no defined attributes" do
-      @arbs.no_attributes.should be_an_instance_of(Hash)
+      expect(@arbs.no_attributes).to be_an_instance_of(Hash)
+    end
+
+    it "returns the default value" do
+      expect(@arbs.friendly).to eq true
     end
 
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -1,21 +1,26 @@
 require 'rubygems'
 require 'rspec'
-require 'lib/no_integrity'
+require './lib/no_integrity'
 
 class MrArbitrary
   include NoIntegrity
-  
+
   attr_accessor :some_random_hash
-  
+
   no_attr_store :some_random_hash
+
   no_attribute :misc
-  no_attribute :hair => 'String'
-  no_attribute :age => 'Integer'
-  no_attribute :height => 'String', :eyes => 'String', :friendly => 'Boolean'
-  no_attribute [:cheese, :ham, :balogne]
-  
+  no_attribute :hair, type: 'String'
+  no_attribute :age, type: 'Integer'
+  no_attribute :height, type: 'String'
+  no_attribute :eyes, type: 'String'
+  no_attribute :friendly, type: 'Boolean', default: true
+  no_attribute :cheese
+  no_attribute :ham
+  no_attribute :balogne
+
   def initialize(*args)
-    @some_random_hash ||= { :hair => 'brown' }
+    @some_random_hash ||= { hair: 'brown' }
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: no_integrity
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Patrick Tulskie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-16 00:00:00 -04:00
+date: 2016-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,32 +24,16 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
-        version: 2.9.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 23
         segments: 
+        - 3
         - 4
-        - 5
         - 0
-        version: 4.5.0
+        version: 3.4.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: Add attributes without any sort of integrity to your ActiveRecord or other types of objects.
 email: 
 - patricktulskie@gmail.com
@@ -64,7 +48,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- autotest/discover.rb
 - lib/no_integrity.rb
 - lib/no_integrity/no_integrity.rb
 - lib/no_integrity/version.rb

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }