volt 0.4.15 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b1635ef6a0d61f2fd334870249bffd6a032a55
-  data.tar.gz: 761fe764d63b32d5ce1e65b482b4094d4a4f12fa
+  metadata.gz: 1a2b43155cd2eff6d57093ba3b4b15997a5cfdd3
+  data.tar.gz: dadd732fcb8340fe213d056448ee6d5352a1d272
 SHA512:
-  metadata.gz: a8c3e07939e8f5f22104bb0e16f30fa4dfb5270741341d31239aa0d4c746089134545a6cfc4214da7915fd6581d191113a8c0560bfee5f3b10c225242a9db17f
-  data.tar.gz: 6fcd81d3d469133e8552869c03a86ca1be4902608e5f825ce580c98716e5a4e8d72be35afafb0aad99097195abf16f6a73e49f03fa94bc08190a91d3377a8696
+  metadata.gz: 83b59d9de4351e1ca97a037c5be7c7f9909345e3e219430da05fb87919a75912e38f4d24354ac4b63f45b0532d2e3f73040f20db8a9e182b699a4ce0511469bc
+  data.tar.gz: 2c8ec7ffb3d62321648c1bae3ec55908683c208b620f57a341d4263bb40f0abb2fecb8c8f0a3f9388b423effa4a859953399e1cda04ac832d01e665b8e121190

data/VERSION

@@ -1 +1 @@
-0.4.15
+0.4.17

data/lib/volt/cli.rb

@@ -6,7 +6,9 @@ class CLI < Thor
   
   desc "new PROJECT_NAME", "generates a new project."
   def new(name)
-    directory("project", name)
+    # Grab the current volt version
+    version = File.read(File.join(File.dirname(__FILE__), '../../VERSION'))
+    directory("project", name, {:version => version})
     
     say "Bundling Gems...."
     `cd #{name} ; bundle -j 4`

data/lib/volt/models/array_model.rb

@@ -1,7 +1,9 @@
 require 'volt/models/model_wrapper'
+require 'volt/models/model_helpers'
 
 class ArrayModel < ReactiveArray
   include ModelWrapper
+  include ModelHelpers
   
   attr_reader :parent, :path, :persistor, :options
 
@@ -51,6 +53,16 @@ class ArrayModel < ReactiveArray
     ArrayModel.new(*args)
   end
   
+  # Convert the model to an array all of the way down
+  def to_a
+    array = []
+    attributes.each do |value|      
+      array << deep_unwrap(value)
+    end
+    
+    return array
+  end
+  
   private
     # Takes the persistor if there is one and
     def setup_persistor(persistor)

data/lib/volt/models/model.rb

@@ -1,5 +1,6 @@
 require 'volt/models/model_wrapper'
 require 'volt/models/array_model'
+require 'volt/models/model_helpers'
 require 'volt/reactive/object_tracking'
 
 class NilMethodCall < NoMethodError
@@ -16,6 +17,7 @@ class Model
   include ReactiveTags
   include ModelWrapper
   include ObjectTracking
+  include ModelHelpers
   
   attr_accessor :attributes
   attr_reader :parent, :path, :persistor, :options
@@ -228,6 +230,16 @@ class Model
     raise "Models do not support hash style lookup.  Hashes inserted into other models are converted to models, see https://github.com/voltrb/volt#automatic-model-conversion"
   end
   
+  # Convert the model to a hash all of the way down.
+  def to_h
+    hash = {}
+    attributes.each_pair do |key, value|
+      hash[key] = deep_unwrap(value)
+    end
+    
+    return hash
+  end
+  
   
   private
     # Clear the previous value and assign a new one

data/lib/volt/models/model_helpers.rb

@@ -0,0 +1,11 @@
+module ModelHelpers
+  def deep_unwrap(value)
+    if value.is_a?(Model)
+      value = value.to_h
+    elsif value.is_a?(ArrayModel)
+      value = value.to_a
+    end
+    
+    return value
+  end
+end

data/spec/models/model_spec.rb

@@ -438,6 +438,23 @@ describe Model do
     expect(a.index(a[1])).to eq(1)
   end
   
+  it "should convert to a hash, and unwrap all of the way down" do
+    a = Model.new
+    a._items << {_name: 'Test1', _other: {_time: 'Now'}}
+    a._items << {_name: 'Test2', _other: {_time: 'Later'}}
+    
+    item1 = a._items[0].to_h.cur
+    expect(item1[:_name]).to eq('Test1')
+    expect(item1[:_other][:_time]).to eq('Now')
+    
+    all_items = a._items.to_a.cur
+    
+    expect(all_items).to eq([
+      {:_name=>"Test1", :_other=>{:_time=>"Now"}},
+      {:_name=>"Test2", :_other=>{:_time=>"Later"}}
+    ])
+  end
+  
   
   describe "model paths" do
     before do

data/templates/project/Gemfile.tt

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'volt'
+gem 'volt', '<%= config[:version] %>'
 
 # Twitter bootstrap
 gem 'volt-bootstrap'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.17
 platform: ruby
 authors:
 - Ryan Stout
@@ -353,6 +353,7 @@ files:
 - lib/volt/models.rb
 - lib/volt/models/array_model.rb
 - lib/volt/models/model.rb
+- lib/volt/models/model_helpers.rb
 - lib/volt/models/model_wrapper.rb
 - lib/volt/models/persistors/array_store.rb
 - lib/volt/models/persistors/base.rb