volt 0.9.4.pre3 → 0.9.4.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb8632dc480ad8c3e725df22fc50513d967aca8
-  data.tar.gz: 7378a263f455ca95b60a04a75fa04409f9e0111f
+  metadata.gz: 336fa7176c4a60f3ea2757f0e78917d40f0faee7
+  data.tar.gz: 2911281e8bea55eca1fdc94568452f75012ee0aa
 SHA512:
-  metadata.gz: 248aa3a47ef194d783dfd47c9ff794663170cccdd06aa66eb2bd4fb197ade72fac333f777d55134bc42d08fb65e25d525dbb9cf91ceb6c5ef53e20f25b7847af
-  data.tar.gz: 09b7f6c57f8296c2079788e64372f3422b373d00b0ce9e64f351f36d640806961ec11df176ef302430d01e0cb9957e81a606fb2b1014a742d30ed7242d44a88d
+  metadata.gz: cb4724687642e194094184b6cd515da2fc1f78ff273ce2049d727dc1c3ea7f3fa07756827bb6b167545aea7f0cad83e40941cf0588a173c847901bd6359b7507
+  data.tar.gz: cb51999eb63a80ad0606e457457325a22fadcba5ec7453b1068d227885e65fec1de5fc4f063b6633fab8d310d92b6ae8976013526f2ec23afb6c0d276a2aeb73

data/CHANGELOG.md

@@ -1,16 +1,29 @@
 # Change Log
 
 ## 0.9.4.pre1
+### Lingo Change
+the base collections will now be called "Repositories" or "Repo's" for short.  This will only matter directly for internal volt code, but for the data provider api, this will help.
+
 ### Added
 - ```root``` can now be called from a model to get the root model on the collection.  (So if the model is on store, it will return ```store```)
 - ```store``` can now be called from inside of a model
+- all repos (```store```, ```page```, ```cookies```, ```params```, etc...) now can be accessed outside of controllers and tasks with ```Volt.current_app.{repository}```  (```Volt.current_app.store``` for example)
 - before_save was added to models.
 - added ```cookies``` model for HttpController
+- added support for serializing Time objects
+- Model's now have a saved_state and saved? method.
+- Volt.current_app now has ```store``` and ```page``` collections accessable from it, and is the preferred way to access those collections outside of controllers and tasks.
+
+### Removed
+- The $page global was removed.  Use ```Volt.current_app``` to get access to repos.
 
 ### Changed
 - fixed bug with ReactiveHash#to_json
 - fixed bug with field Numeric coersion
 - fixed issue with initializers not loading on client sometimes.
+- fixed issue with user password change
+- fix issue storing Time in a hash
+- fixed issue with local_store not persisting in some cases
 
 ## 0.9.3
 [0.9.3 Update Blog Post](http://blog.voltframework.com/post/121128931859/0-9-3-stuff-you-asked-for)

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,15 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)

data/README.md

@@ -41,6 +41,8 @@ Rick Carlino has been putting together some great volt tutorial videos also.
 - [Build a Realtime Chat App with Volt](http://datamelon.io/blog/2015/building-a-chat-app-in-volt.html)
 - [Understanding Volt Views](http://datamelon.io/blog/2015/understanding-views-in-volt-with-a-card-game.html)
 
+@anhbizcad maintains a [playlist of Volt related videos](https://www.youtube.com/watch?v=McxtO8ybxy8&list=PLmQFeDKFCPXatHb-zEXwfeMH01DPiZjP7).
+
 # Getting Help
 
 Have a question and need help?  The volt team watches [stackoverflow](http://stackoverflow.com/search?q=voltrb) for questions and will get back to you quickly.  Be sure to post the question with the #voltrb tag.  If you have something you'd like to discuss, drop into our [gitter room](https://gitter.im/voltrb/volt).

data/app/volt/models/user.rb

@@ -42,11 +42,13 @@ module Volt
       def hash_password
         password = get('password')
 
-        # Clear the password
-        set('password', nil)
+        if password.present?
+          # Clear the password
+          set('password', nil)
 
-        # Set the hashed_password field instead
-        set('hashed_password', BCrypt::Password.create(password))
+          # Set the hashed_password field instead
+          set('hashed_password', BCrypt::Password.create(password))
+        end
       end
     end
   end

data/lib/volt/boot.rb

@@ -11,8 +11,6 @@ require 'volt/server/rack/component_paths'
 
 if RUBY_PLATFORM == 'opal'
   require 'volt'
-else
-  require 'volt/page/page'
 end
 require 'volt/volt/app'
 

data/lib/volt/cli/bundle.rb

@@ -0,0 +1,29 @@
+module Volt
+  module Bundle
+    # Run bundle from inside of cli, borrowed from rails:
+    # https://github.com/rails/rails/blob/21f7bcbaa7709ed072bb2e1273d25c09eeaa26d9/railties/lib/rails/generators/app_base.rb
+    def bundle_command(command)
+      say_status :run, "bundle #{command}"
+
+      # We are going to shell out rather than invoking Bundler::CLI.new(command)
+      # because `volt new` loads the Thor gem and on the other hand bundler uses
+      # its own vendored Thor, which could be a different version. Running both
+      # things in the same process is a recipe for a night with paracetamol.
+      #
+      # We unset temporary bundler variables to load proper bundler and Gemfile.
+      #
+      # Thanks to James Tucker for the Gem tricks involved in this call.
+      _bundle_command = Gem.bin_path('bundler', 'bundle')
+
+      require 'bundler'
+      Bundler.with_clean_env do
+        full_command = %Q["#{Gem.ruby}" "#{_bundle_command}" #{command}]
+        if options[:quiet]
+          system(full_command, out: File::NULL)
+        else
+          system(full_command)
+        end
+      end
+    end
+  end
+end

data/lib/volt/cli/console.rb

@@ -52,11 +52,11 @@ module Volt
   class Console
     module Helpers
       def store
-        @volt_app.page.store
+        @volt_app.store
       end
 
       def page
-        @volt_app.page.page
+        @volt_app.page
       end
     end
 

data/lib/volt/cli/generate.rb

@@ -29,6 +29,8 @@ class Generate < Thor
                        lazy_default: [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find { |e| !e.nil? && !e.empty? },
                        required: false, banner: '/path/to/your/editor',
                        desc: 'Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)'
+  method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
+  method_option :mit, :type => :boolean, :desc => "Generate an MIT license file"
 
   def gem(name)
     require 'volt/cli/new_gem'

data/lib/volt/cli/new_gem.rb

@@ -9,6 +9,7 @@ class NewGem
     @thor = thor
     @component_name = name.chomp('/')
     @name = 'volt-' + @component_name # remove trailing slash if present
+    @shell = Thor::Base.shell.new
 
     if gem_is_available?
       @thor.say("#{@name} is available!  Making gem files.", :green)
@@ -56,6 +57,24 @@ class NewGem
   end
 
   def copy_options
+    if @options[:coc] or yes?("\nDo you want to include a code of conduct in this gem?\n\n\
+Codes of conduct can increase contributions to your project by contributors who \
+prefer collaborative, safe spaces. You can read more about the code of conduct at \
+contributor-covenant.org. Having a code of conduct means agreeing to the responsibility \
+of enforcing it, so be sure that you are prepared to do that. For suggestions about \
+how to enforce codes of conduct, see bit.ly/coc-enforcement.\n\ny/(n):")
+
+      copy('newgem/CODE_OF_CONDUCT.md.tt', 'CODE_OF_CONDUCT.md')
+    end
+
+    if @options[:mit] or yes?("\nDo you want to license your code permissively under the MIT license?\n\n\
+This means that any other developer or company will be legally allowed to use your code \
+for free as long as they admit you created it. You can read more about the MIT license \
+at choosealicense.com/licenses/mit.\n\ny/(n):")
+
+      copy('newgem/LICENSE.txt.tt', 'LICENSE.txt')
+    end
+
     copy('newgem/bin/newgem.tt', "bin/#{@name}") if @options[:bin]
     copy('newgem/rspec.tt', '.rspec')
     copy('newgem/spec/spec_helper.rb.tt', 'spec/spec_helper.rb')
@@ -105,4 +124,8 @@ class NewGem
 
     constant_name
   end
+
+  def yes?(msg)
+    @shell.yes?(msg)
+  end
 end

data/lib/volt/cli.rb

@@ -5,10 +5,12 @@ require 'thor'
 require 'volt/extra_core/extra_core'
 require 'volt/cli/generate'
 require 'volt/version'
+require 'volt/cli/bundle'
 
 module Volt
   class CLI < Thor
     include Thor::Actions
+    include Volt::Bundle
 
     register(Generate, 'generate', 'generate GENERATOR [args]', 'Run a generator.')
 
@@ -20,10 +22,21 @@ module Volt
       # Grab the current volt version
       directory('project', name, version: Volt::Version::STRING, name: name, domain: name.dasherize.downcase, app_name: name.capitalize)
 
-      say 'Bundling Gems...'
-      `cd #{name} && bundle`
+      # Move into the directory
+      Dir.chdir(name) do
+        # bundle
+        bundle_command('install')
+      end
+
+      say ""
+      say "Your app is now ready in the #{name} directory.", :green
+      say ""
+      say "To run your app: "
+      say "  cd #{name}"
+      say "  bundle exec volt server"
     end
 
+
     desc 'console', 'run the console on the project in the current directory'
 
     def console

data/lib/volt/controllers/collection_helpers.rb

@@ -2,17 +2,48 @@
 # @page is expected to be defined and a Volt::Page
 module Volt
   module CollectionHelpers
+    def url
+      Volt.current_app.url
+    end
 
     def url_for(params)
-      @page.url.url_for(params)
+      Volt.current_app.url.url_for(params)
     end
 
     def url_with(params)
-      @page.url.url_with(params)
+      Volt.current_app.url.url_with(params)
     end
 
     def store
-      @page.store
+      Volt.current_app.store
+    end
+
+    def page
+      Volt.current_app.page
+    end
+
+    def flash
+      Volt.current_app.flash
+    end
+
+    def params
+      Volt.current_app.params
+    end
+
+    def local_store
+      Volt.current_app.local_store
+    end
+
+    def cookies
+      Volt.current_app.cookies
+    end
+
+    def channel
+      Volt.current_app.channel
+    end
+
+    def tasks
+      Volt.current_app.tasks
     end
   end
 end

data/lib/volt/controllers/http_controller.rb

@@ -43,7 +43,7 @@ module Volt
     attr_reader :response_headers, :request
 
     def store
-      @volt_app.page.store
+      @volt_app.store
     end
 
     def head(status, additional_headers = {})

data/lib/volt/controllers/model_controller.rb

@@ -55,6 +55,15 @@ module Volt
       return nil
     end
 
+    # the u method provides an easy helper to render an unbonud binding.  This
+    # means that the binding will not reactively update.  If no bindings are
+    # bound on any model's from a query, the query will not be reactively
+    # listened to.
+    def u
+      raise "the 'u' method requires a block" unless block_given?
+      Volt::Computation.run_without_tracking { yield }
+    end
+
     # yield_html renders the content passed into a tag as a string.  You can ```.watch!```
     # ```yield_html``` and it will be run again when anything in the template changes.
     def yield_html
@@ -135,7 +144,6 @@ module Volt
 
     def initialize(volt_app, *args)
       @volt_app = volt_app
-      @page = volt_app.page
 
       # Track that the initialize was called
       @__init_called = true
@@ -168,38 +176,6 @@ module Volt
       end
     end
 
-    def page
-      @page.page
-    end
-
-    def flash
-      @page.flash
-    end
-
-    def params
-      @page.params
-    end
-
-    def local_store
-      @page.local_store
-    end
-
-    def cookies
-      @page.cookies
-    end
-
-    def url
-      @page.url
-    end
-
-    def channel
-      @page.channel
-    end
-
-    def tasks
-      @page.tasks
-    end
-
     def controller
       @controller ||= Model.new
     end

data/lib/volt/helpers/time.rb

@@ -0,0 +1,43 @@
+# Much of this class was borrowed from ActiveSupport:
+# https://github.com/rails/rails/blob/ca9736e78ca9348e785a5c78c8cc085c0c2d4731/activesupport/lib/active_support/core_ext/time/calculations.rb
+
+class Time
+  # Returns a new Time where one or more of the elements have been changed according
+  # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>) reset cascadingly, so if only the hour is passed,
+  # then minute, sec, and usec is set to 0. If the hour and minute is passed, then
+  # sec and usec is set to 0.  The +options+ parameter takes a hash with any of these
+  # keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>.
+  #
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(day: 1)              # => Time.new(2012, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, day: 1)  # => Time.new(1981, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, hour: 0) # => Time.new(1981, 8, 29, 0, 0, 0)
+  def change(options)
+    new_year  = options.fetch(:year, year)
+    new_month = options.fetch(:month, month)
+    new_day   = options.fetch(:day, day)
+    new_hour  = options.fetch(:hour, hour)
+    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    # new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    # TODO: Opal doesn't have rational yet, so usec's don't get added in right yet
+    ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec, utc_offset)
+  end
+
+  def beginning_of_day
+    #(self - seconds_since_midnight).change(usec: 0)
+    change(:hour => 0, :min => 0, :sec => 0)
+  end
+
+   # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
+  def end_of_day
+    change(
+      :hour => 23,
+      :min => 59,
+      :sec => 59,
+      # :usec => Rational(999999999, 1000)
+    )
+  end
+end

data/lib/volt/models/array_model.rb

@@ -1,8 +1,8 @@
 require 'volt/reactive/reactive_array'
 require 'volt/models/model_wrapper'
-require 'volt/models/model_helpers/model_helpers'
+require 'volt/models/helpers/base'
 require 'volt/models/state_manager'
-require 'volt/models/state_helpers'
+require 'volt/models/helpers/array_model'
 require 'volt/data_stores/data_store'
 
 module Volt
@@ -10,9 +10,9 @@ module Volt
 
   class ArrayModel < ReactiveArray
     include ModelWrapper
-    include ModelHelpers
+    include Models::Helpers::Base
     include StateManager
-    include StateHelpers
+    include Models::Helpers::ArrayModel
 
     attr_reader :parent, :path, :persistor, :options, :array
 
@@ -87,72 +87,22 @@ module Volt
 
     # Make sure it gets wrapped
     def <<(model)
-      if model.is_a?(Model)
-        # Set the new path and the persistor.
-        model.options = @options.merge(path: @options[:path] + [:[]])
-      else
-        model = wrap_values([model]).first
-      end
-
-
-      if model.is_a?(Model)
-        if !model.can_create?
-          fail "permissions did not allow create for #{model.inspect}"
-        end
-
-        # Add it to the array and trigger any watches or on events.
-        super(model)
-
-        @persistor.added(model, @array.size - 1)
-
-        # Validate and save
-        promise = model.run_changed.then do
-          # Mark the model as not new
-          model.instance_variable_set('@new', false)
-
-          # Mark the model as loaded
-          model.change_state_to(:loaded_state, :loaded)
-
-       end.fail do |err|
-          # remove from the collection because it failed to save on the server
-          # we don't need to call delete on the server.
-          index = @array.index(model)
-          delete_at(index, true)
-
-          # remove from the id list
-          @persistor.try(:remove_tracking_id, model)
-
-          # re-raise, err might not be an Error object, so we use a rejected promise to re-raise
-          Promise.new.reject(err)
-        end
-      else
-        promise = nil.then do
-          # Add it to the array and trigger any watches or on events.
-          super(model)
-
-          @persistor.added(model, @array.size - 1)
-        end
-      end
-
-      promise.then do
-        # resolve the model
-        model
-      end
+      create_new_model(model, :<<)
     end
 
+    # Alias append for use inside of child append
+    alias_method :reactive_array_append, :append
     # Works like << except it always returns a promise
     def append(model)
-      # Wrap results in a promise
-      Promise.new.resolve(nil).then do
-        send(:<<, model)
-      end
+      create_new_model(model, :append)
     end
 
     # Create does append with a default empty model
     def create(model={})
-      append(model)
+      create_new_model(model, :create)
     end
 
+
     def delete(val)
       # Check to make sure the models are allowed to be deleted
       if !val.is_a?(Model) || val.can_delete?
@@ -219,24 +169,8 @@ module Volt
 
     # returns a promise to fetch the first instance
     def fetch_first(&block)
-      persistor = self.persistor
-
-      if persistor && persistor.is_a?(Persistors::ArrayStore)
-        # On array store, we wait for the result to be loaded in.
-        promise = limit(1).fetch do |res|
-          result = res.first
-
-          result
-        end
-      else
-        # On all other persistors, it should be loaded already
-        promise = Promise.new.resolve(first)
-      end
-
-      # Run any passed in blocks after fetch
-      promise = promise.then(&block) if block
-
-      promise
+      Volt.logger.warn('.fetch_first is deprecated in favor of .first')
+      first
     end
 
     # Make sure it gets wrapped
@@ -256,7 +190,7 @@ module Volt
     end
 
     def new_array_model(*args)
-      ArrayModel.new(*args)
+      Volt::ArrayModel.class_at_path(options[:path]).new(*args)
     end
 
     # Convert the model to an array all of the way down
@@ -283,17 +217,15 @@ module Volt
 
 
     def inspect
-      Computation.run_without_tracking do
-        # Track on size
-        @size_dep.depend
-        str = "#<#{self.class}"
-        # str += " state:#{loaded_state}"
-        # str += " path:#{path.join('.')}" if path
-        # str += " persistor:#{persistor.inspect}" if persistor
-        str += " #{@array.inspect}>"
-
-        str
-      end
+      # Track on size
+      @size_dep.depend
+      str = "#<#{self.class}"
+      # str += " state:#{loaded_state}"
+      # str += " path:#{path.join('.')}" if path
+      # str += " persistor:#{persistor.inspect}" if persistor
+      str += " #{@array.inspect}>"
+
+      str
     end
 
     def buffer(attrs = {})
@@ -317,6 +249,80 @@ module Volt
       end
     end
 
+    def self.process_class_name(name)
+      name.pluralize
+    end
+
+    private
+    # called form <<, append, and create.  If a hash is passed in, it converts
+    # it to a model.  Then it takes the model and inserts it into the ArrayModel
+    # then persists it.
+    def create_new_model(model, from_method)
+      if model.is_a?(Model)
+        if model.buffer?
+          fail "The #{from_method} does not take a buffer.  Call .save! on buffer's to persist them."
+        end
+
+        # Set the new path and the persistor.
+        model.options = @options.merge(path: @options[:path] + [:[]])
+      else
+        model = wrap_values([model]).first
+      end
+
+
+      if model.is_a?(Model)
+        if !model.can_create?
+          fail "permissions did not allow create for #{model.inspect}"
+        end
+
+        # Add it to the array and trigger any watches or on events.
+        reactive_array_append(model)
+
+        @persistor.added(model, @array.size - 1)
+
+        # Validate and save
+        promise = model.run_changed.then do
+          # Mark the model as not new
+          model.instance_variable_set('@new', false)
+
+          # Mark the model as loaded
+          model.change_state_to(:loaded_state, :loaded)
+
+        end.fail do |err|
+          # remove from the collection because it failed to save on the server
+          # we don't need to call delete on the server.
+          index = @array.index(model)
+          delete_at(index, true)
+
+          # remove from the id list
+          @persistor.try(:remove_tracking_id, model)
+
+          # re-raise, err might not be an Error object, so we use a rejected promise to re-raise
+          Promise.new.reject(err)
+        end
+      else
+        promise = nil.then do
+          # Add it to the array and trigger any watches or on events.
+          reactive_array_append(model)
+
+          @persistor.added(model, @array.size - 1)
+        end
+      end
+
+      promise = promise.then do
+        # resolve the model
+        model
+      end
+
+      # unwrap the promise if the persistor is synchronus.
+      # This will return the value or raise the exception.
+      promise = promise.unwrap unless @persistor.async?
+
+      # return
+      promise
+    end
+
+
     # We need to setup the proxy methods below where they are defined.
     proxy_with_load :[], :size, :last, :reverse, :all, :to_a