hashmodel 0.4.0.beta1 → 0.4.0.beta2

data/spec/support/configuration.rb

@@ -0,0 +1,50 @@
+require 'hashmodel'
+
+RSpec.configure do |config|
+  config.before(:each) do
+
+    @records = [
+      {:switch => ["-x", "--xtended"], :parameter => {:type => String, :required => true}, :description => "Xish stuff"},
+      {:switch => ["-y", "--why"],  :description => "lucky what?"},
+      {:switch => "-z",  :parameter => {:type => String}, :description => "zee svitch zu moost calz"},
+    ]
+    @hm = HashModel.new(:raw_data=>@records)
+
+    @records2 = [
+      {:switch => ["-p", "--pea"], :parameter => {:type => Hash, :required => false}, :description => "Pea soup"},
+      {:switch => ["-q", "--quit"],  :description => "exit the game"},
+      {:switch => "-r",  :parameter => {:type => Fixnum}, :description => "Arrrrrrrrrrgh!"},
+    ]
+    @hm2 = HashModel.new(:raw_data=>@records2)
+    
+    @flat_records = [
+      {:switch=>"-x", :parameter=>{:type=>String, :required=>true}, :description=>"Xish stuff", :_id=>0, :_group_id=>0}, 
+      {:switch=>"--xtended", :parameter=>{:type=>String, :required=>true}, :description=>"Xish stuff", :_id=>1, :_group_id=>0}, 
+      {:switch=>"-y", :description=>"lucky what?", :_id=>2, :_group_id=>1}, 
+      {:switch=>"--why", :description=>"lucky what?", :_id=>3, :_group_id=>1}, 
+      {:switch=>"-z", :parameter=>{:type=>String}, :description=>"zee svitch zu moost calz", :_id=>4, :_group_id=>2}
+    ]
+    
+    @flat_records2 =[
+      {:switch=>"-p", :parameter=>{:type=>Hash, :required=>false}, :description=>"Pea soup", :_id=>0, :_group_id=>0},
+      {:switch=>"--pea", :parameter=>{:type=>Hash, :required=>false}, :description=>"Pea soup", :_id=>1, :_group_id=>0},
+      {:switch=>"-q", :description=>"exit the game", :_id=>2, :_group_id=>1},
+      {:switch=>"--quit", :description=>"exit the game", :_id=>3, :_group_id=>1},
+      {:switch=>"-r", :parameter=>{:type=>Fixnum}, :description=>"Arrrrrrrrrrgh!", :_id=>4, :_group_id=>2}
+    ]
+    
+    @flat_records_all = [
+      {:switch=>"-x", :parameter=>{:type=>String, :required=>true}, :description=>"Xish stuff", :_id=>0, :_group_id=>0}, 
+      {:switch=>"--xtended", :parameter=>{:type=>String, :required=>true}, :description=>"Xish stuff", :_id=>1, :_group_id=>0}, 
+      {:switch=>"-y", :description=>"lucky what?", :_id=>2, :_group_id=>1}, 
+      {:switch=>"--why", :description=>"lucky what?", :_id=>3, :_group_id=>1}, 
+      {:switch=>"-z", :parameter=>{:type=>String}, :description=>"zee svitch zu moost calz", :_id=>4, :_group_id=>2}, 
+      {:switch=>"-p", :parameter=>{:type=>Hash, :required=>false}, :description=>"Pea soup", :_id=>5, :_group_id=>3}, 
+      {:switch=>"--pea", :parameter=>{:type=>Hash, :required=>false}, :description=>"Pea soup", :_id=>6, :_group_id=>3}, 
+      {:switch=>"-q", :description=>"exit the game", :_id=>7, :_group_id=>4}, 
+      {:switch=>"--quit", :description=>"exit the game", :_id=>8, :_group_id=>4}, 
+      {:switch=>"-r", :parameter=>{:type=>Fixnum}, :description=>"Arrrrrrrrrrgh!", :_id=>9, :_group_id=>5}
+    ]
+
+  end
+end

data/spec/support/debug_print.rb

@@ -0,0 +1,13 @@
+# Debug print
+module Kernel
+  def dp(value="")
+    puts ""
+    puts "*" * 40
+    puts value
+    puts "&" * 40
+    puts ""
+  end
+  def dpi(value)
+    dp value.inspect
+  end
+end

data/spec/support/proc_tester.rb

@@ -0,0 +1,17 @@
+# Make a new class with the given name and create instance variables set using key,value pairs.
+# e.g. new_class = create_class "Dummy", {:x=>"x", :y=>String, :z=>["1",2,:three]}
+def create_proc_tester(property_value_hash)
+  proc_test = Class.new.new
+
+  # Add an evaluator method to make it more clear what we are doing
+  proc_test.class.class_eval do
+     define_method(:xql?) { |&block| instance_eval &block }
+  end
+
+  # Add the property values to this instance of the class
+  property_value_hash.each do |key, value| 
+    proc_test.instance_variable_set("@#{key}", value)
+  end
+
+  proc_test
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashmodel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-19 00:00:00.000000000 -04:00
+date: 2011-03-21 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2157841220 !ruby/object:Gem::Requirement
+  requirement: &2158452320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157841220
+  version_requirements: *2158452320
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &2157840800 !ruby/object:Gem::Requirement
+  requirement: &2158451900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157840800
+  version_requirements: *2158451900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157840380 !ruby/object:Gem::Requirement
+  requirement: &2158451480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157840380
+  version_requirements: *2158451480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157839940 !ruby/object:Gem::Requirement
+  requirement: &2158451040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157839940
-description: A simple MVC type model class for storing records based on nested hashes
-  as an array of hashes. You can store deeply nested hashes and still easily flatten
-  and query the records using flattened field names.
+  version_requirements: *2158451040
+description: A hash based MVC model class that makes searching and updating deeply
+  nested hashes a breeze. You can store deeply nested hashes and still easily flatten,
+  query, and update the records using flattened field names.
 email:
 - mikbe.tk@gmail.com
 executables: []
@@ -73,20 +73,6 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- _brainstorm/StrangeMarshal.txt
-- _brainstorm/_readme
-- _brainstorm/block_wheres.rb
-- _brainstorm/clone.rb
-- _brainstorm/hash_model_examples.rb
-- _brainstorm/hash_test.rb
-- _brainstorm/inspect.rb
-- _brainstorm/instance_vars.rb
-- _brainstorm/proc_tests.rb
-- _brainstorm/ref_val.rb
-- _brainstorm/regex_captures.rb
-- _brainstorm/spliting.rb
-- _brainstorm/test.rb
-- _brainstorm/unflat.rb
 - autotest/discover.rb
 - features/README
 - features/hash_model_flatten.feature
@@ -98,12 +84,34 @@ files:
 - hashmodel.gemspec
 - lib/hash_model/exceptions.rb
 - lib/hash_model/hash_model.rb
+- lib/hash_model/hash_model_create_object.rb
+- lib/hash_model/hash_model_delete.rb
+- lib/hash_model/hash_model_filter.rb
+- lib/hash_model/hash_model_flatten.rb
+- lib/hash_model/hash_model_group.rb
+- lib/hash_model/hash_model_update.rb
+- lib/hash_model/hash_model_where.rb
 - lib/hash_model/version.rb
 - lib/hashmodel.rb
+- lib/monkey_patch/deep_clone.rb
+- spec/hash_model/_current_spec.rb
 - spec/hash_model/_marshelling_spec.rb
+- spec/hash_model/hash_model_adding_records_spec.rb
+- spec/hash_model/hash_model_array_methods_spec.rb
+- spec/hash_model/hash_model_comparisons_spec.rb
+- spec/hash_model/hash_model_delete_spec.rb
+- spec/hash_model/hash_model_flattening_spec.rb
+- spec/hash_model/hash_model_group_spec.rb
+- spec/hash_model/hash_model_searching_spec.rb
 - spec/hash_model/hash_model_spec.rb
+- spec/hash_model/hash_model_unflattening_spec.rb
+- spec/hash_model/hash_model_update_spec.rb
+- spec/hash_model/hash_model_where_spec.rb
 - spec/hash_model/hashmodel.dat
 - spec/spec_helper.rb
+- spec/support/configuration.rb
+- spec/support/debug_print.rb
+- spec/support/proc_tester.rb
 has_rdoc: true
 homepage: http://github.com/mikbe/hashmodel
 licenses: []
@@ -137,7 +145,21 @@ test_files:
 - features/step_definitions/hash_model_steps.rb
 - features/support/env.rb
 - features/support/helper.rb
+- spec/hash_model/_current_spec.rb
 - spec/hash_model/_marshelling_spec.rb
+- spec/hash_model/hash_model_adding_records_spec.rb
+- spec/hash_model/hash_model_array_methods_spec.rb
+- spec/hash_model/hash_model_comparisons_spec.rb
+- spec/hash_model/hash_model_delete_spec.rb
+- spec/hash_model/hash_model_flattening_spec.rb
+- spec/hash_model/hash_model_group_spec.rb
+- spec/hash_model/hash_model_searching_spec.rb
 - spec/hash_model/hash_model_spec.rb
+- spec/hash_model/hash_model_unflattening_spec.rb
+- spec/hash_model/hash_model_update_spec.rb
+- spec/hash_model/hash_model_where_spec.rb
 - spec/hash_model/hashmodel.dat
 - spec/spec_helper.rb
+- spec/support/configuration.rb
+- spec/support/debug_print.rb
+- spec/support/proc_tester.rb

data/_brainstorm/_readme

@@ -1 +0,0 @@
-This is my scratchpad area where I try stuff out. Nothing really useful here.

data/_brainstorm/block_wheres.rb

@@ -1,80 +0,0 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "/../lib"))
-require 'hash_model'
-=begin
-
-  # Creates an object with instance variables for each field at every level
-  # This allows using a block like {:field1==true && :field2_subfield21="potato"}
-  def create_object_from_flat_hash(record, hash_record=Class.new.new, parent_key=nil)
-  
-    # Iterate through the record creating the object recursively
-    case record
-      when Hash
-        record.each do |key, value|
-          flat_key = "#{parent_key}#{"__" if !parent_key.nil?}#{key}"
-          hash_record.instance_variable_set("@#{flat_key}", value)
-          hash_record = create_object_from_flat_hash(value, hash_record, flat_key)
-        end
-      when Array
-        record.each do |value|
-          hash_record = create_object_from_flat_hash(value, hash_record, parent_key)
-        end
-      else
-        hash_record.instance_variable_set("@#{parent_key}", record)
-    end # case
-    
-    hash_record
-  end # create_object_from_flat_hash
-
-
-
-records = [
-  {:switch => ["-x", "--xtended"], :parameter => {:type => String, :required => true}, :description => "Xish stuff", :something => 4},
-  {:switch => ["-y", "--why"],  :description => "lucky what?"},
-  {:switch => "-z",  :parameter => {:type => String, :required => true}, :description => "zee svitch zu moost calz", :something => 4},
-]
-hm = HashModel.new(:raw_data=>records)
-where = hm.where {:something == 4 && :parameter__type == String && :parameter__required == true}
-puts "\nWhere:"
-puts where
-
-
-records = [
-  {:switch => ["-x", "--xtended"], :parameter => {:type => String, :required => true}, :description => "Xish stuff", :something => 4},
-  {:switch => ["-y", "--why"],  :description => "lucky what?", :something => 7},
-  {:switch => "-z",  :parameter => {:type => Integer, :required => true}, :description => "zee svitch zu moost calz", :something => 4},
-]
-hm = HashModel.new(:raw_data=>records)
-where = hm.where {:parameter == {:type => String, :required => true}}
-puts "\nWhere:"
-puts where
-
-
-puts "\nflat object"
-flat = create_object_from_flat_hash(hm[0]) 
-puts flat.inspect
-=end
-
-puts "\nproc"
-xproc = proc {:parameter == {:type => String, :required => true} && :switch == ["-x", "--xtended"]}
-xproc_source = xproc.to_source
-puts "xproc: #{xproc_source}"
-
-matches = xproc_source.scan(/(\:\S+) ==/)
-
-puts "matches: #{matches}"
-puts "\nshow items"
-matches.each do |item|
-  puts "item: #{item}"
-end
-puts 'done'
-#"proc { #{@filter} }.call".gsub(":", "@")
-
-#x = "{:parameter == {:type => String, :required => true}, "
-#x.match
-
-puts "\nMatch test"
-text = "The future Ruby is Ruby"
-m1 = text.scan(/(Ruby)/)
-puts "m1: #{m1}"
-
-puts "\n\ndone"

data/_brainstorm/clone.rb

@@ -1,19 +0,0 @@
-x = ["x", "y", "z"]
-
-class Foo
-
-  attr_accessor :array
-  
-  def initialize(input)
-    @array = input
-  end
-  
-end
-
-
-
-f = Foo.new(x)
-
-x[0] = "change"
-
-puts f.array

data/_brainstorm/hash_model_examples.rb

@@ -1,57 +0,0 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "/../lib"))
-require 'hash_model'
-require 'sourcify'
-
-records = [
-  {:switch => ["-x", "--xtended"], :parameter => {:type => String, :require => true}, :description => "Xish stuff"},
-  {:switch => ["-y", "--why"],  :description => "lucky what?"},
-  {:switch => "-z",  :parameter => {:type => String}, :description => "zee svitch zu moost calz"},
-]
-
-=begin
-hash_model = HashModel.new(:raw_data=>records)
-
-records = [  
-  {:switch => ["-x", "--xtended"], :parameter => {:type => String, :require => true}, :description => "Xish stuff"},  
-  {:switch => ["-y", "--why"],  :description => "lucky what?"}
-]
-
-records2 = {:switch => "-z",  :parameter => {:type => String}, :description => "zee svitch zu moost calz"}
-
-hash_model = HashModel.new(:raw_data => records)
-hash_model2 = HashModel.new(:raw_data => records2)
-
-hash_model << hash_model2
-# or
-    hash_model += hash_model2
-
-
-		# Flatten index is automatically set to the first field ever given
-		# but you can change it
-    records = [  
-      {:switch => ["-x", "--xtended"], :parameter => {:type => String, :require => true}, :description => "Xish stuff"},  
-      {:switch => ["-y", "--why"],  :description => "lucky what?"},  
-      {:switch => "-z",  :parameter => {:type => String}, :description => "zee svitch zu moost calz"},  
-    ]  
-    hash_model = HashModel.new(:raw_data=>records)  
-		
-		puts hash_model.flatten_index
-		# you can use flattened field names
-		hash_model.flatten_index = :parameter__type
-		puts hash_model
-		
-		>> {:parameter__type=>String, :switch=>["-x", "--xtended"], :parameter__require=>true, :description=>"Xish stuff", :_id=>0, :_group_id=>0}
-    >> {:parameter__type=>nil, :switch=>["-y", "--why"], :description=>"lucky what?", :_id=>1, :_group_id=>1}
-    >> {:parameter__type=>String, :switch=>"-z", :description=>"zee svitch zu moost calz", :_id=>2, :_group_id=>2}
-
-    # Notice that records that don't have the flatten index have their value set to nil
-=end    
-    # The real strength of the class is its ability to search flattened fields
-    hash_model = HashModel.new(:raw_data=>records)  
-
-    # default is to use the flatten index
-    puts hash_model.where("-z")
-    
-    # but you can also use a block with boolean search parameters
-    # You must write the field names as @variables instead of symbols
-    puts hash_model.where {@parameter_type}

data/_brainstorm/hash_test.rb

@@ -1,169 +0,0 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "/../lib"))
-require 'hash_model'
-
-hash = {
-          :field1 => "f", 
-          :field2 => {
-            :field3 => "f3", 
-            :field4 => {
-              :field5 => "f5", 
-              :field6 => ["f6", "f7"]
-            }
-          }
-        }
-=begin
-
-hash2 = {
-  :switch => ["-x", "--xtend"], 
-  :parameter => {:type => String, :require => true}, 
-  :description => "Xish stuff", 
-  :field => {:field2 => {:field3 => "ff3", :field4 => "ff4"}}
-}
-
-hash2 = {
-  :switch => ["-x", "--xtend"], 
-  :parameter => {:type => String, :require => true}, 
-  :description => "Xish stuff", 
-  :field => {:field2 => [:field3 => "ff3", :field4 => "ff4", "ff5"]}
-}
-
-
-hm = HashModel.new
-hm << hash2
-hm.flatten_index = :field__field2
-
-
-flat = {
-        :field2__field4__field5=>"f5", 
-        :field1=>"f", 
-        :field3=>"f3", 
-        :field2__field4__field6=>["f6", "f7"]
-      }
-
-[
-  {
-    :field__field2__field3=>"ff3",
-    :field__field2__field4=>"ff4", 
-    :switch=>["-x", "--xtend"], 
-    :parameter__type=>String,
-    :parameter__require=>true, 
-    :description=>"Xish stuff",
-  }
-]
-
-puts "\nhm: #{hm}"
-#hash2 = {:field => "field", :field2__field3 => "field3", :field2__field4 => {:field5 => "field5", :field6 => ["field6", "field7"]}}}
-=end
-
-
-
-def unflatten(input)
-  # Seriously in need of a refactor, just looking at this hurts my brain
-  case input
-    when Hash
-      new_record = {}
-      input.each do |key, value|
-        puts "#{key} => #{value}"
-        # recursively look for flattened keys
-        keys = key.to_s.split("__", 2)
-        if keys[1]
-          key = keys[0].to_sym
-          value = unflatten({keys[1].to_sym => value})
-        end
-      
-        # Don't overwrite existing value
-        if (existing = new_record[key])
-          # convert to array and search for subkeys if appropriate
-          if existing.class == Hash
-            # Convert to an array if something other than a hash is added
-            unless value.class == Hash
-              new_record[key] = hash_to_array(existing)
-              new_record[key] << value
-            else
-              # Search subkeys for duplicate values if it's a hash
-              unless (found_keys = existing.keys & value.keys).empty?
-                found_keys.each do |found_key|
-                  if new_record[key][found_key].class == Hash
-                    unless value[found_key].class == Hash
-                      new_record[key] = hash_to_array(new_record[key][found_key])
-                      new_record[key] << value[found_key]
-                    else
-                      new_record[key][found_key].merge!(value[found_key])
-                    end
-                  end
-                end
-              else
-                new_record[key].merge!(value)
-              end
-            end
-          else
-            new_record[key] << value
-          end
-        else
-          new_record.merge!(key => value)
-        end
-      end
-      new_record
-    when Array
-      # recurse into array
-      input.collect! {|item| unflatten(item) }
-    else
-      input
-  end
-end
-
-
-def hash_to_array(hash)
-  array = []
-  hash.each do |key, value|
-    array << {key => value}
-  end
-  array
-end
-
-hash = [
-  {
-    :field__field2__field3=>"ff3",
-    :field__field2__field4=>"ff4"
-  }
-]
-
-hash2 =  { 
-    :switch=>["-x", "--xtend"], 
-    :parameter__type=>String,
-    :parameter__require=>true,
-    :description=>"Xish stuff",
-  }
-
-
-hash3 =  { 
-    :switch=>[{:deep1 => "deepOne"}, {:deep2 => "deepTwo"}, "--xtend"], 
-    :parameter__type=>String,
-    :parameter__require=>true,
-    :description=>"Xish stuff",
-  }
-
-
-hash4 =  { 
-    :parameter__type=>String,
-    :switch__deep1__deep3 => "deepTwo",
-    :parameter__type__ruby=>true,
-    :parameter => "glorp",
-    :parameter__require=>true,
-    :switch__deep2 => "deepTwo",
-    :description=>"Xish stuff",
-    :switch => "--xtend",
-  }
-
-
-unflat = unflatten(hash4)
-puts "\nUnflat: #{unflat}"
-
-=begin
-puts "to_a: #{hash2.to_a}"
-
-x = [1,2,3]
-y = [3,4,5]
-
-puts "\nx & y = #{x & y}"
-=end