fume 0.8.1a → 0.9.0

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-
+## 0.9.0
+ - extract cancan to standalone gem
+ - remove authlogic ext
 
 ## 0.8.0
  - don't depends all rails plugin, you must depend it for yourself. 

data/VERSION

@@ -1 +1 @@
-0.8.1a
+0.9.0

data/fume.gemspec

@@ -18,23 +18,9 @@ Gem::Specification.new do |s|
   
   
   # rails
-  s.add_runtime_dependency "rails", "~> 3.2.1"
-  s.add_runtime_dependency "rails-i18n", "~> 0.3.0"
-  
-  # require library
-  s.add_runtime_dependency "hashie", ">= 1.2.0"
-  
-  # library
-  # s.add_runtime_dependency "timeliness", "~> 0.3.4"
-  # s.add_runtime_dependency "addressable", "~> 2.2.6"
-  
-  # rails plugin
-  # s.add_runtime_dependency "authlogic", "~> 3.0.3"
-  # s.add_runtime_dependency "formtastic", "~> 1.2.4"
-  # s.add_runtime_dependency "cancan", "~> 1.6.5"
-  # s.add_runtime_dependency "symbolize", "~> 3.2.0"
-  # s.add_runtime_dependency "meta_search", "~> 1.0.6"
-  # s.add_runtime_dependency "kaminari", "~> 0.12.4"
+  s.add_dependency "rails", "~> 3.2.7"
+  s.add_dependency "rails-i18n", "~> 0.6.5"
+  s.add_dependency "hashie", ">= 1.2.0"
   
   # development
   s.add_development_dependency "version"

data/lib/fume.rb

@@ -1,24 +1,18 @@
 require "active_support"
-require File.expand_path("../fume/railtie", __FILE__)
-
-# 3rd gems
 require "rails-i18n"
 
-
 module Fume
-  extend ActiveSupport::Autoload
+  VERSION = File.read(File.expand_path("../../VERSION", __FILE__)).chomp
   
-  autoload :Authlogic
+  extend ActiveSupport::Autoload
   autoload :RailsExt
-  autoload :Cancan
   autoload :SimpleNav
   autoload :AppSettingLoader
   autoload :RenderCache
   
-  VERSION = File.read(File.expand_path("../../VERSION", __FILE__)).chomp
-  
   def self.load_tasks
     Dir[File.expand_path("../tasks/*.rake", __FILE__)].each { |ext| load ext }
   end
-  
 end
+
+require File.expand_path("../fume/railtie", __FILE__)

data/lib/fume/app_setting_loader.rb

@@ -1,8 +1,7 @@
 module Fume
-  
   class AppSettingLoader
-
-    def self.try_enable(app)
+    
+    def self.init!
       %w[application.extra.rb application.local.rb].each do |config_filename|
         path = Rails.root.join("config", config_filename)
         require path if File.exists?(path)

data/lib/fume/rails_ext.rb

@@ -1,22 +1,19 @@
 module Fume
   module RailsExt
-    def self.try_enable(app)
-      if defined? ::ActionController
-        ActionController::Base.send :include, ControllerExtensions
+    
+    def self.init!
+      if defined? ::ActionController::Base
+        ::ActionController::Base.send :include, ControllerExtensions
       end
       
-      if defined? ::ActiveRecord
-        ::ActiveRecord::Base.send :include, ActiveRecordExtensions
+      if defined? ::ActionView::Base
+        ::ActionView::Base.send :include, HelperExtensions
       end
     end
     
-    module ActiveRecordExtensions
-      extend ActiveSupport::Concern
-      
-      module ClassMethods
-        def last_updated_at
-          self.reorder("").select("MAX(#{self.table_name}.updated_at) AS updated_at").first.try(:updated_at)
-        end
+    module HelperExtensions
+      def ok_url_tag
+        hidden_field_tag "ok_url", params[:ok_url] if !params[:ok_url].blank?
       end
     end
     
@@ -43,32 +40,31 @@ module Fume
         end
       end
       
-      module InstanceMethods
-        
-        protected
-        def redirect_to_ok_url_or_default(default)
-          redirect_to params[:ok_url] || default
-        end
-        
-        def public_url(source)
-          if source.include?("://")
-            source
-          else
-            request.protocol + request.host_with_port + public_path(source)
-          end
+    protected
+      def redirect_to_ok_url_or_default(default)
+        redirect_to params[:ok_url] || default
+      end
+      
+      def public_url(source)
+        if source.include?("://")
+          source
+        else
+          "#{request.protocol}#{request.host_with_port}#{public_path(source)}"
         end
+      end
 
-        def public_path(source)
-          if source.include?("://")
-            source
-          else
-            url = url_for("#{source}")
-            "#{request.script_name}#{url}"
-          end
+      def public_path(source)
+        url = url_for(source)
+        return url if url.include?("://")
+        
+        if url.start_with?(request.script_name)
+          url
+        else
+          "#{request.script_name}#{url}"
         end
       end
+      
     end
-    
   end
 end
 

data/lib/fume/railtie.rb

@@ -3,13 +3,13 @@ require "rails/railtie"
 module Fume
   class Railtie < ::Rails::Railtie
     initializer 'fume.initialize', :after => :after_initialize do |app|
-      Fume.constants.each do |name|
-        ext_module = Fume.const_get(name)
-        
-        if ext_module.respond_to?(:try_enable)
-          ext_module.try_enable(app)
-        end
-      end
+      RailsExt.init!
+      RenderCache.init!
+      SimpleNav.init!
+    end
+    
+    initializer "fume.after_initialize", :after => :after_initialize do |app|
+      AppSettingLoader.init!
     end
     
     rake_tasks do

data/lib/fume/render_cache.rb

@@ -1,69 +1,81 @@
 module Fume
   module RenderCache
     
-    def self.try_enable(app)
-      if defined? ::ActionController
-        ActionController::Base.send :include, ControllerExtensions
+    def self.init!
+      if defined? ::ActionController::Base
+        ::ActionController::Base.send :include, ControllerExtensions
+      end
+      
+      if defined? ::ActiveRecord::Base
+        ::ActiveRecord::Base.send :include, ActiveRecordExtensions
+      end
+    end
+    
+    module ActiveRecordExtensions
+      extend ::ActiveSupport::Concern
+      
+      module ClassMethods
+        def last_updated_at
+          self.reorder("").select("MAX(#{self.table_name}.updated_at) AS updated_at").first.try(:updated_at)
+        end
       end
     end
     
     module ControllerExtensions
-      extend ActiveSupport::Concern
+      extend ::ActiveSupport::Concern
 
       included do
         attr_accessor :render_cache_params
         around_filter RenderCacheFilter.new
       end
 
-      module InstanceMethods
-        protected
-        def render_cache(key, options = {})
-          if self.class.perform_caching
-            key = build_render_cache_key(key)
-            cache = Rails.cache
-
-            fragment = cache.read(key)
-            if fragment
-              response.charset = fragment[:charset]
-              response.content_type = fragment[:content_type]
-              self.response_body = fragment[:body].html_safe
-            else
-              yield if block_given?
+    protected
+      def render_cache(key, options = {})
+        if self.class.perform_caching
+          key = build_render_cache_key(key)
+          cache = Rails.cache
 
-              self.render_cache_params = {
-                :key => key,
-                :options => options,
-                :cache => cache
-              }
-            end
+          fragment = cache.read(key)
+          if fragment
+            response.charset = fragment[:charset]
+            response.content_type = fragment[:content_type]
+            self.response_body = fragment[:body].html_safe
           else
             yield if block_given?
-          end
 
+            self.render_cache_params = {
+              :key => key,
+              :options => options,
+              :cache => cache
+            }
+          end
+        else
+          yield if block_given?
         end
 
-        def build_render_cache_key(key)
-          base = "render@#{params[:controller]}/#{params[:action]}.#{params[:format]}"
-          key = self.key_to_string(key)
-          "#{base}##{key}"
-        end
+      end
 
-        def key_to_string(obj)
-          case obj
-          when nil
-            "nil!"
-          when Hash
-            obj.keys.sort.map { |k| "#{k}=#{self.key_to_string(obj[k])}" }.join("&")
-          when Array
-            obj.map { |val| self.key_to_string(val) }.join(",")
-          when Time, Date
-            obj.to_s(:db)
-          else
-            obj.to_s
-          end
-        end
+      def build_render_cache_key(key)
+        base = "render@#{params[:controller]}/#{params[:action]}.#{params[:format]}"
+        key = self.key_to_string(key)
+        "#{base}##{key}"
+      end
 
+      def key_to_string(obj)
+        case obj
+        when nil
+          "nil!"
+        when Hash
+          obj.keys.sort.map { |k| "#{k}=#{self.key_to_string(obj[k])}" }.join("&")
+        when Array
+          obj.map { |val| self.key_to_string(val) }.join(",")
+        when Time, Date
+          obj.to_s(:db)
+        else
+          obj.to_s
+        end
       end
+
     end
     
     class RenderCacheFilter

data/lib/fume/simple_nav.rb

@@ -3,8 +3,10 @@ require "hashie"
 module Fume
   module SimpleNav
     
-    def self.try_enable(app)
-      ActionView::Base.send :include, HelperExtensions
+    def self.init!
+      if defined? ::ActionView::Base
+        ::ActionView::Base.send :include, HelperExtensions
+      end
     end
     
     module HelperExtensions

metadata

@@ -1,41 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: fume
 version: !ruby/object:Gem::Version
-  version: 0.8.1a
-  prerelease: 5
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70313373491960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70313373491960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: rails-i18n
-  requirement: &70313373491460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70313373491460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70313373491000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70313373491000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70313373490620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313373490620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a simple rails scaffold.
 email:
 - Sunteya@gmail.com
@@ -71,8 +91,6 @@ files:
 - fume.gemspec
 - lib/fume.rb
 - lib/fume/app_setting_loader.rb
-- lib/fume/authlogic.rb
-- lib/fume/cancan.rb
 - lib/fume/rails_ext.rb
 - lib/fume/railtie.rb
 - lib/fume/render_cache.rb
@@ -85,11 +103,6 @@ files:
 - lib/generators/fume/simple_scaffold/templates/index.html.erb
 - lib/generators/fume/simple_scaffold/templates/new.html.erb
 - lib/tasks/cache.rake
-- rails_generators/fume/fume_generator.rb
-- rails_generators/fume/rspec/rspec_gen.rb
-- rails_generators/fume/rspec/templates/spec/support/erb_macros.rb
-- rails_generators/fume/rspec/templates/spec/support/fume_controller_macros.rb
-- spec/fume/cancan_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/sunteya/fume
@@ -106,20 +119,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 19325340432934255
+      hash: -559507536724635748
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -559507536724635748
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a simple rails scaffold.
 test_files:
-- spec/fume/cancan_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/fume/authlogic.rb

@@ -1,34 +0,0 @@
-module Fume
-  module Authlogic
-    def self.try_enable(app)
-      if defined? ::Authlogic
-        ActionController::Base.send :include, ControllerExtensions
-      end
-    end
-    
-    module ControllerExtensions
-      extend ActiveSupport::Concern
-      
-      included do
-        helper_method :current_user_session, :current_user
-      end
-      
-      module InstanceMethods
-        
-        protected
-        def current_user_session
-          return @current_user_session if defined?(@current_user_session)
-          @current_user_session = UserSession.find
-        end
-
-        def current_user
-          return @current_user if defined?(@current_user)
-          @current_user = current_user_session && current_user_session.user
-        end
-        
-      end
-    end
-  end
-end
-
-

data/lib/fume/cancan.rb

@@ -1,43 +0,0 @@
-module Fume
-  module Cancan
-    def self.try_enable(app)
-      if defined? ::CanCan
-        ActionController::Base.send :include, ControllerExtensions
-      end
-    end
-
-    module ControllerExtensions
-      extend ActiveSupport::Concern
-      
-      module ClassMethods
-        
-        def authorize_object(options = {})
-          filter_options = options.slice(:only, :except) if options.is_a?(Hash)
-          before_filter(filter_options || {}) do |controller|
-            controller.send :authorize_object!, options
-          end
-        end
-        
-      end
-
-      module InstanceMethods
-        
-        protected
-        def authorize_object!(options)
-          action = params[:action].to_sym
-          case options
-          when Hash
-            authorize! action, options[:object]
-          else
-            authorize! action, options
-          end
-        end
-        
-      end
-    end
-    
-  end
-  
-end
-
-

data/rails_generators/fume/fume_generator.rb

@@ -1,55 +0,0 @@
-class FumeGenerator < Rails::Generator::Base
-
-  attr_accessor :gen
-  delegate :source_path, :destination_path, :manifest, :after_generate, :replay, :to => :gen
-  
-  def initialize(runtime_args, runtime_options = {})
-    super
-    
-    usage if args.empty?
-    gen_name = args.shift
-    
-    gen_path = File.join(spec.path, gen_name)
-    gen_spec = Fume::Gen::Spec.new(gen_name, gen_path, gen_path)
-    
-    @gen = gen_spec.klass.new(runtime_args, runtime_options)
-  end
-end
-
-
-module Fume
-  module Gen
-    class Base < Rails::Generator::Base
-      def destination_root_pathname
-        Pathname.new(self.destination_root)
-      end
-
-      def source_root_pathname
-        Pathname.new(self.source_root)
-      end
-      
-      def cp_files(m, pattern)
-        Pathname.glob(source_root_pathname.join(pattern)) do |source_path|
-          relative_path = source_path.relative_path_from(source_root_pathname)
-          destination_path = destination_root_pathname.join(relative_path)
-
-          if source_path.directory?
-            m.directory relative_path unless destination_path.exist?
-          else
-            m.file relative_path.to_s, relative_path.to_s
-          end
-        end
-      end
-    end
-    
-    class Spec < Rails::Generator::Spec
-      def class_file
-        "#{path}/#{name}_gen.rb"
-      end
-
-      def class_name
-        "#{name.camelize}Gen"
-      end
-    end
-  end
-end

data/rails_generators/fume/rspec/rspec_gen.rb

@@ -1,8 +0,0 @@
-class RspecGen < Fume::Gen::Base
-
-  def manifest
-    record do |m|
-      cp_files m, File.join("**", "*")
-    end
-  end
-end

data/rails_generators/fume/rspec/templates/spec/support/erb_macros.rb

@@ -1,18 +0,0 @@
-module ErbMacros
-  def self.included(base)
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
-  end
-
-  module ClassMethods
-  end
-  
-  module InstanceMethods
-    def render_template(template)
-      erb = ERB.new(template.read)
-      tmp_file = Tempfile.new("erb")
-      File.open(tmp_file.path, "wb") { |f| f.write(erb.result(binding)) } 
-      tmp_file
-    end
-  end
-end

data/rails_generators/fume/rspec/templates/spec/support/fume_controller_macros.rb

@@ -1,118 +0,0 @@
-module FumeControllerMacros
-  def self.included(base)
-    base.send :extend, ClassMethods
-    base.send :include, InstanceMethods
-  end
-
-  module ClassMethods
-    
-    class ActionMethod < Struct.new(:method, :action)
-      def to_proc
-        eval <<-EOV
-          Proc.new do |params|
-            #{method} "#{action}", params
-          end
-        EOV
-      end
-    end
-    
-    %w{ get post put delete }.each do |name|
-      define_method(name) do |*actions|
-        [ actions ].flatten.map do |action|
-          ActionMethod.new(name, action)
-        end
-      end
-    end
-    
-    
-    %w{ be_success be_redirect be_invalid }.each do |be_method|
-      eval %Q[
-      def it_should_#{be_method}_for(*args, &block)
-        options = args.extract_options!() || {}
-        action_methods = args.flatten
-        action_methods.each do |action_method|
-          it "should #{be_method} for \#{action_method.method} :\#{action_method.action} action \#{options[:message]}" do
-            params = {}
-            if block_given?
-              result = self.instance_exec(&block)
-              params = result if result.is_a? Hash
-            end
-
-            self.instance_exec(params, &action_method)
-            response.should #{be_method}
-          end
-        end
-      end
-      ]
-    end
-    
-    
-    def it_should_be_like_restful_resources(options = {}, &block)
-      actions = [ :index, :new, :create, :show, :edit, :update, :destroy ]
-      actions &= [ options[:only] ].flatten if options[:only]
-      actions -= [ options[:except] ].flatten if options[:except]
-
-      if actions.include?(:index)
-        it_should_be_success_for get(:index) do
-          params = instance_exec(&block)
-        end
-      end
-      
-      if actions.include?(:show)
-        it_should_be_success_for get(:show) do
-          params = instance_exec(&block)
-        end
-      end
-
-      if actions.include?(:new)
-        it_should_be_success_for get(:new) do
-          params = instance_exec(&block)
-        end
-      end
-
-      if actions.include?(:create)
-        it_should_be_redirect_for post(:create) do
-          params = instance_exec(&block)
-          params.merge(params.delete(:valid_attributes))
-        end
-
-        it_should_be_invalid_for post(:create) do
-          params = instance_exec(&block)
-          params.merge(params.delete(:invalid_attributes))
-        end
-      end
-
-      if actions.include?(:edit)
-        it_should_be_success_for get(:edit) do
-          params = instance_exec(&block)
-        end
-      end
-
-      if actions.include?(:update)
-        it_should_be_redirect_for put(:update) do
-          params = instance_exec(&block)
-          params.merge(params.delete(:valid_attributes))
-        end
-
-        it_should_be_invalid_for put(:update) do
-          params = instance_exec(&block)
-          params.merge(params.delete(:invalid_attributes))
-        end
-      end
-
-      if actions.include?(:destroy)
-        it_should_be_redirect_for delete(:destroy) do
-          params = instance_exec(&block)
-        end
-      end
-    end
-    
-  end # ClassMethods
-
-  module InstanceMethods
-    def be_invalid(*args)
-      be_success(*args)
-    end
-  end
-
-end

data/spec/fume/cancan_spec.rb

@@ -1,13 +0,0 @@
-require "spec_helper"
-
-describe Fume::Cancan do
-  before(:each) do
-    Fume::Cancan.try_enable
-    @controller_class = Class.new(ActionController::Base)
-  end
-
-  it "should add method to action controller base" do
-    @controller_class.methods.should be_include "authorize_namespace"
-    @controller_class.instance_methods.should be_include "authorize_namespace"
-  end
-end