sisyphus-rails 0.0.2 → 0.0.4

data/README.md

@@ -23,6 +23,7 @@ For a basic install include the following in your *app/assets/javascripts/applic
 To support IE6/7 users include jStorage as well
 
     //= require jstorage
+    //= require sisyphus
 
 ## How it Works
 
@@ -54,8 +55,7 @@ To stop Sisyphus from initializing on a form include the *with_sisyphus* option
 - Tests
 - Move away from form_tag_helper, should be able to do it all from form_helper? Script tag can go at the end anyhow. Why aren't we doing that right now? We don't seem to have access to the same variables that the regular form_for does. Also the options array gets muddied by the FormHelper form_for call -> it removes the [:html] section (we need the id of the form for sisyphus). 
 - conflict resolution... i.e. you have an object edit form, the fields are populated from the DB but if you have local browser changes they may get overridden. We need a way to resolve conflicts between local and remote data -> could use a jquery based modal dialog to present the diff?
-- Model/Object based exclusions via config or activerecord extension?
-- Env. based and global on/off switches
+- Model based exclusions via activerecord extension?
 - block based options (this would allow us to easily and neatly implement Sisyphus options)
 
     <%= form_for User.new do |f| %>

data/lib/generators/sisyphus/configuration/configuration_generator.rb

@@ -0,0 +1,14 @@
+module Sisyphus
+  module Generators
+    class ConfigurationGenerator < ::Rails::Generators::Base
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc "Creates blank config file for extended configuration."
+
+      def create_yaml
+        template "sisyphus.yml", "config/sisyphus.yml"
+      end
+    end
+  end
+end

data/lib/generators/sisyphus/configuration/templates/sisyphus.yml

@@ -0,0 +1,14 @@
+production:
+  # globally enable or disable sisyphus form protection
+  sisyphus_enabled: true
+  # models to exclude from the default enabled state
+  # note that lower case singular is used
+  # exclude_models: user,post
+  # models to include from the default disbaled state
+  # include_models: user,post
+
+development:
+  sisyphus_enabled: true
+
+test:
+  sisyphus_enabled: true

data/lib/sisyphus-rails.rb

@@ -5,5 +5,10 @@ require "sisyphus-rails/form_tag_helper"
 
 module Sisyphus
   mattr_accessor :process
+  mattr_accessor :app_root
+  mattr_accessor :config
   
+  def self.setup
+    yield self
+  end
 end

data/lib/sisyphus-rails/engine.rb

@@ -1,4 +1,31 @@
 module Sisyphus
   class Engine < ::Rails::Engine
+
+    initializer "sisyphus-rails.load_config_data" do |app|
+      Sisyphus.setup do |config|
+        config.app_root = app.root
+    
+        #Load the configuration from the environment or a yaml file
+        Sisyphus.config = Hash.new
+
+        #load the config file if we have it
+        if FileTest.exist?("#{::Rails.root}/config/sisyphus.yml")
+          config = YAML.load_file("#{::Rails.root}/config/sisyphus.yml")
+          config = config[::Rails.env]
+
+          Sisyphus.config["SISYPHUS_ENABLED"] = config['sisyphus_enabled'] if config.include?('sisyphus_enabled')
+          Sisyphus.config["EXCLUDE_MODELS"] = config['exclude_models'].split(',') if config.include?('exclude_models')
+          Sisyphus.config["INCLUDE_MODELS"] = config['include_models'].split(',') if config.include?('include_models')
+          
+        end
+
+        #if we have ENV flags prefer them
+        Sisyphus.config["SISYPHUS_ENABLED"] = ENV["SISYPHUS_ENABLED"] if ENV.include?("SISYPHUS_ENABLED")
+        Sisyphus.config["EXCLUDE_MODELS"] = ENV["EXCLUDE_MODELS"].split(',') if ENV.include?("EXCLUDE_MODELS")
+        Sisyphus.config["INCLUDE_MODELS"] = ENV["INCLUDE_MODELS"].split(',') if ENV.include?("INCLUDE_MODELS")
+
+      end
+    end
+
   end
 end

data/lib/sisyphus-rails/form_helper.rb

@@ -2,13 +2,27 @@ module ActionView
   module Helpers
     module FormHelper
       def form_for_with_sisyphus(record, options = {}, &proc)
-           
-        if options[:with_sisyphus] == false 
-          Sisyphus::process = false
+
+        case record
+        when String, Symbol
+          object_name = record
         else
-          Sisyphus::process = true
+          object      = record.is_a?(Array) ? record.last : record
+          object_name = options[:as] || ActiveModel::Naming.param_key(object)
         end
 
+
+        # There is an order of precedence debugger
+        Sisyphus::process = true
+
+        Sisyphus::process = Sisyphus::config["SISYPHUS_ENABLED"] if Sisyphus::config.include?("SISYPHUS_ENABLED")
+
+        if Sisyphus::config["EXCLUDE_MODELS"].present?
+           Sisyphus::process = false if Sisyphus::config["EXCLUDE_MODELS"].include?(model_name_from_record_or_class(object_name))
+        end
+
+        Sisyphus::process = options[:with_sisyphus] if options.include?(:with_sisyphus)
+
         #strip all the sisyphus options from the options hash before moving on
         form_for_without_sisyphus(record, options.reject{|k,v| k =~ /sisyphus(.*)/}, &proc)
       end

data/lib/sisyphus-rails/version.rb

@@ -1,5 +1,5 @@
 module Sisyphus
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sisyphus-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,6 +39,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/generators/sisyphus/configuration/configuration_generator.rb
+- lib/generators/sisyphus/configuration/templates/sisyphus.yml
 - lib/sisyphus-rails.rb
 - lib/sisyphus-rails/engine.rb
 - lib/sisyphus-rails/form_helper.rb
@@ -61,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -93684305
+      hash: -690969235
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -93684305
+      hash: -690969235
 requirements:
 - requires jQuery 1.4+ to be included before Sisyphus
 - requires jQuery 1.8+ to be included if you require jStorage