volt 0.9.6.pre2 → 0.9.6.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b909f645dc9943c62dcd512df36371ac4c1dfc
-  data.tar.gz: 3b1bc0f0bdeef3eef63f9f7fbcbf47042a9f3fbe
+  metadata.gz: af40ada934fde21bab3077199e52634e939d0316
+  data.tar.gz: 6029344175c2e1fb6004226f3b7a83cc04420d90
 SHA512:
-  metadata.gz: af36ac78914b63e4c3a1c9161a64ec36e85f317320540461bb5008852261a9c0f66a2016f9130d4578122fd4eab8f1bba62eff2e8c48746d9451d87bab66c09e
-  data.tar.gz: 909e57f674271f32315f0f987cb28035703ed949bd704fe601c7ad547a287b9262a10f45525964796f8c92d557102cb3e232f44a82761f7a6da43acf854b12f6
+  metadata.gz: a83fff0163894a9d6bb91d2d50a4e746632c6650420522cd5c08442442de3ab71ca710e2b146bbd328990a9f9303e3e54e3bb43599458c4745532df8219e3773
+  data.tar.gz: 9587b05a0126bc352bc1d003d53380b3cd1ae0fb3f0ac9c2a02e2ba83c39c2aa2bd35e11a745c8e9a2cafc76ae8f4dc0673a8187d3ff5da611a91026ed47f866

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 sauce_connect.log
 .ruby-gemset
 tags
+config/db/

data/Gemfile

@@ -33,7 +33,6 @@ end
 
 group :development, :test do
   platform :mri do
-    gem 'bson_ext'
 
     # For running tests
     gem 'thin'

data/app/volt/tasks/live_query/live_query.rb

@@ -55,7 +55,6 @@ class LiveQuery
   end
 
   def notify_changed(id, data, skip_channel)
-    # puts "NOTIFY CHANGED"
     model = nil
 
     notify!(skip_channel) do |channel|

data/lib/volt/models/persistors/model_store.rb

@@ -164,14 +164,10 @@ module Volt
 
         # Do the actual writing of data to the database, only runs on the backend.
         def save_to_db!(values)
-          # puts "SAVE TO DB: #{values.inspect}"
           # Check to make sure the model has no validation errors.
           errors = @model.errors
           return errors if errors.present?
 
-          # Passed, save it
-          id = values[:id]
-
           # Try to create
           update_result = db.update(collection, values)
 

data/lib/volt/page/channel.rb

@@ -38,7 +38,7 @@ module Volt
           socket_url = "://#{socket_url}"
         end
 
-        ws_proto = (`document.location.protocol` == 'https://') ? 'wss' : 'ws'
+        ws_proto = (`document.location.protocol` == 'https:') ? 'wss' : 'ws'
 
         # Add wss? to the front
         socket_url = "#{ws_proto}#{socket_url}"

data/lib/volt/utils/data_transformer.rb

@@ -0,0 +1,49 @@
+# DataTransformer is a singleton class that walks ruby data structures (nested
+# hashes, arrays, etc..) and lets you transform them based on values or keys
+#
+# NOTE: DataTransformer is not automatically required, but can be when needed.
+
+module Volt
+  class DataTransformer
+    # Takes a hash or array, and nested map's over the values, yielding to
+    # the block the value.  The return value from the block replaces the
+    # previous value.
+    # NOTE: This does not yield hashes or arrays.
+    def self.transform(data, &block)
+      if data.is_a?(Hash)
+        data.map do |key, value|
+          key = transform(key, &block)
+          value = transform(value, &block)
+          [key, value]
+        end.to_h
+      elsif data.is_a?(Array)
+        data.map do |value|
+          transform(value, &block)
+        end
+      else
+        # yield to the trasnformer
+        yield(data)
+      end
+    end
+
+    # Like #transform, except it only yields keys.
+    def self.transform_keys(data, &block)
+      if data.is_a?(Hash)
+        data.map do |key, value|
+          key = transform_keys(key, &block)
+          value = transform_keys(value, &block)
+
+          # map the key
+          [yield(key), value]
+        end.to_h
+      elsif data.is_a?(Array)
+        data.map do |value|
+          transform_keys(value, &block)
+        end
+      else
+        # no mapping
+        data
+      end
+    end
+  end
+end

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.6.pre2'
+    STRING = '0.9.6.pre3'
   end
 end

data/spec/apps/kitchen_sink/Gemfile

@@ -51,5 +51,4 @@ platform :mri do
   # Thin is the default volt server, you Puma is also supported
   gem 'thin', '~> 1.6.0'
   # gem 'puma'
-  gem 'bson_ext', '~> 1.9.0'
 end

data/spec/apps/kitchen_sink/app/main/models/post.rb

@@ -2,4 +2,5 @@ class Post < Volt::Model
   field :title, String
 
   validate :title, length: 5
-end
+
+end

data/spec/apps/kitchen_sink/app/main/models/user.rb

@@ -8,20 +8,20 @@ class User < Volt::User
   validate :email, email: true
 
   unless RUBY_PLATFORM == "opal"
-  	Volt.current_app.on("user_connect") do |user_id|
-  		begin
-  			Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_connect"
-  		rescue
-  			#we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
-  		end
-  	end
+    Volt.current_app.on("user_connect") do |user_id|
+      begin
+        Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_connect"
+      rescue
+        #we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
+      end
+    end
 
-  	Volt.current_app.on("user_disconnect") do |user_id|
-  		begin
-  			Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_disconnect"
-  		rescue
-  			#we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
-  		end
-  	end
+    Volt.current_app.on("user_disconnect") do |user_id|
+      begin
+        user = Volt.current_app.store.users.where(id: user_id).first.sync._event_triggered = "user_disconnect"
+      rescue => e
+        #we rescue as this callback will also get called from the SocketConnectionHandler specs (and will fail)
+      end
+    end
   end
 end

data/spec/integration/callbacks_spec.rb

@@ -2,30 +2,30 @@ require 'spec_helper'
 
 describe 'lifecycle callbacks', type: :feature, sauce: true do
 
-	context 'with a user' do
-		before do
-		    # Add the user
-		    store._users! << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
-		end
+  context 'with a user' do
+    before do
+      # Add the user
+      store._users! << { email: 'test@test.com', password: 'awes0mesEcRet', name: 'Test Account 9550' }
+    end
 
-		it 'should trigger a user_connect event when a user logs in and a user_disconnect event when a user logs out' do
-			visit '/'
+    it 'should trigger a user_connect event when a user logs in and a user_disconnect event when a user logs out' do
+      visit '/'
 
-			click_link 'Login'
+      click_link 'Login'
 
-			fields = all(:css, 'form .form-control')
-			fields[0].set('test@test.com')
-			fields[1].set('awes0mesEcRet')
-			click_button 'Login'
+      fields = all(:css, 'form .form-control')
+      fields[0].set('test@test.com')
+      fields[1].set('awes0mesEcRet')
+      click_button 'Login'
 
-			visit '/callbacks'
+      visit '/callbacks'
 
-			expect(page).to have_content('user_connect')
+      expect(page).to have_content('user_connect')
 
-			click_link 'Test Account 9550'
-			click_link 'Logout'
+      click_link 'Test Account 9550'
+      click_link 'Logout'
 
-			expect(page).to have_content('user_disconnect')
-		end
-	end
-end
+      expect(page).to have_content('user_disconnect')
+    end
+  end
+end

data/spec/utils/data_transformer_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'volt/utils/data_transformer'
+
+describe Volt::DataTransformer do
+  it 'should transform values' do
+    data = {
+      name: 'Bob',
+      stuff: [
+        {key: /regex/}
+      ],
+      other: /another regex/,
+      /some reg/ => 'value'
+    }
+
+    transformed = {
+      :name=>"Bob",
+      :stuff=>[
+        {:key=>"a regex"}
+      ],
+      :other=>"a regex",
+      "a regex"=>"value"
+    }
+
+    result = Volt::DataTransformer.transform(data) do |value|
+      if value.is_a?(Regexp)
+        'a regex'
+      else
+        value
+      end
+    end
+
+    expect(result).to eq(transformed)
+  end
+
+  it 'should transform keys' do
+    data = {
+      'name' => 'Ryan',
+      'info' => [
+        {'place' => 'Bozeman'}
+      ]
+    }
+    transformed = {:name=>"Ryan", :info=>[{:place=>"Bozeman"}]}
+    result = Volt::DataTransformer.transform_keys(data) do |key|
+      key.to_sym
+    end
+
+    expect(result).to eq(transformed)
+  end
+end

data/templates/newgem/Gemfile.tt

@@ -8,8 +8,5 @@ gemspec
 # The implementation of ReadWriteLock in Volt uses concurrent ruby and ext helps performance.
 gem 'concurrent-ruby-ext', '~> 0.8.0'
 
-# For mongo (optional)
-gem 'bson_ext', '~> 1.9.0'
-
 # Gems you use for development should be added to the gemspec file as
 # development dependencies.

data/templates/project/Gemfile.tt

@@ -44,7 +44,6 @@ platform :mri, :mingw, :x64_mingw do
 
   # Thin is the default volt server, Puma is also supported
   gem 'thin', '~> 1.6.0'
-  gem 'bson_ext', '~> 1.9.0'
 end
 
 group :production do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.6.pre2
+  version: 0.9.6.pre3
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -584,11 +584,11 @@ files:
 - lib/volt/spec/capybara.rb
 - lib/volt/spec/sauce_labs.rb
 - lib/volt/spec/setup.rb
-- lib/volt/store/mongo.rb
 - lib/volt/tasks/dispatcher.rb
 - lib/volt/tasks/task.rb
 - lib/volt/utils/boolean_patch.rb
 - lib/volt/utils/csso_patch.rb
+- lib/volt/utils/data_transformer.rb
 - lib/volt/utils/ejson.rb
 - lib/volt/utils/event_counter.rb
 - lib/volt/utils/generic_counting_pool.rb
@@ -767,13 +767,13 @@ files:
 - spec/server/rack/sprockets_helpers_setup.rb
 - spec/server/socket_connection_handler_spec.rb
 - spec/spec_helper.rb
-- spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb
 - spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
+- spec/utils/data_transformer_spec.rb
 - spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb
@@ -1046,13 +1046,13 @@ test_files:
 - spec/server/rack/sprockets_helpers_setup.rb
 - spec/server/socket_connection_handler_spec.rb
 - spec/spec_helper.rb
-- spec/store/mongo_spec.rb
 - spec/tasks/dispatcher_spec.rb
 - spec/tasks/live_query_spec.rb
 - spec/tasks/query_tasks.rb
 - spec/tasks/query_tracker_spec.rb
 - spec/tasks/user_tasks_spec.rb
 - spec/templates/targets/binding_document/component_node_spec.rb
+- spec/utils/data_transformer_spec.rb
 - spec/utils/ejson_spec.rb
 - spec/utils/generic_counting_pool_spec.rb
 - spec/utils/generic_pool_spec.rb

data/lib/volt/store/mongo.rb

@@ -1,5 +0,0 @@
-require 'mongo'
-
-mongo_client = Mongo::MongoClient.new('localhost', 27_017)
-
-db = mongo_client.db('test1')

data/spec/store/mongo_spec.rb

@@ -1,7 +0,0 @@
-# require 'mongo'
-# include Mongo
-#
-# mongo_client = MongoClient.new("localhost", 27017)
-# items = mongo_client['docs']['items']
-#
-# items