fume 0.5.1 → 0.5.2

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
+coverage
 pkg/*
 tmp/*

data/Rakefile

@@ -8,10 +8,12 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+namespace :spec do
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 end
 
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 5
-:patch: 1
+:patch: 2
 :major: 0
 :build: 

data/depends.rb

@@ -12,7 +12,8 @@ GemLoader.setup do
   scope :optional do
     gem "authlogic", ">= 2.1.3"
     gem "searchlogic", ">= 2.4.12"
-    gem "formtastic", ">= 0.9.7"
+    gem "formtastic", ">= 0.9.8"
+    gem "cancan", ">= 1.1.1"
   end
   
   scope :test do

data/fume.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fume}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2010-04-15}
+  s.date = %q{2010-04-21}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "fume.gemspec",
      "lib/fume.rb",
      "lib/fume/authlogic.rb",
+     "lib/fume/cancan.rb",
      "lib/fume/daemon.rb",
      "lib/fume/formtastic.rb",
      "lib/fume/logger_support.rb",
@@ -70,6 +71,7 @@ Gem::Specification.new do |s|
      "rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.ba-bbq-1.2.1.js",
      "rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.corner-2.09.js",
      "rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.timepicker-0.2.1.js",
+     "spec/fume/cancan_spec.rb",
      "spec/fume/daemon_spec.rb",
      "spec/fume/logger_support_spec.rb",
      "spec/fume/smart_logger_spec.rb",
@@ -83,7 +85,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{a simple rails scaffold.}
   s.test_files = [
-    "spec/fume/daemon_spec.rb",
+    "spec/fume/cancan_spec.rb",
+     "spec/fume/daemon_spec.rb",
      "spec/fume/logger_support_spec.rb",
      "spec/fume/smart_logger_spec.rb",
      "spec/rails_stub.rb",
@@ -99,14 +102,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.5"])
       s.add_development_dependency(%q<authlogic>, [">= 2.1.3"])
       s.add_development_dependency(%q<searchlogic>, [">= 2.4.12"])
-      s.add_development_dependency(%q<formtastic>, [">= 0.9.7"])
+      s.add_development_dependency(%q<formtastic>, [">= 0.9.8"])
+      s.add_development_dependency(%q<cancan>, [">= 1.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
       s.add_dependency(%q<gem_loader>, [">= 0.2.0"])
       s.add_dependency(%q<actionpack>, ["~> 2.3.5"])
       s.add_dependency(%q<authlogic>, [">= 2.1.3"])
       s.add_dependency(%q<searchlogic>, [">= 2.4.12"])
-      s.add_dependency(%q<formtastic>, [">= 0.9.7"])
+      s.add_dependency(%q<formtastic>, [">= 0.9.8"])
+      s.add_dependency(%q<cancan>, [">= 1.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
@@ -114,7 +119,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<actionpack>, ["~> 2.3.5"])
     s.add_dependency(%q<authlogic>, [">= 2.1.3"])
     s.add_dependency(%q<searchlogic>, [">= 2.4.12"])
-    s.add_dependency(%q<formtastic>, [">= 0.9.7"])
+    s.add_dependency(%q<formtastic>, [">= 0.9.8"])
+    s.add_dependency(%q<cancan>, [">= 1.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end

data/lib/fume/cancan.rb

@@ -0,0 +1,34 @@
+module Fume
+  module Cancan
+    def self.try_enable
+      if defined? ::CanCan
+        ActionController::Base.send :include, ControllerExtensions
+      end
+    end
+
+    module ControllerExtensions
+      def self.included(base)
+        base.send :extend, ClassMehtods
+        base.send :include, InstanceMethods
+      end
+      
+      module ClassMehtods
+        def authorize_namespace(options = {})
+          before_filter(:authorize_namespace, options.slice(:only, :except))
+          write_inheritable_hash(:authorize_namespace, options)
+        end
+      end
+
+      module InstanceMethods
+        protected
+        def authorize_namespace
+          options = self.class.read_inheritable_attribute(:authorize_namespace)
+          unauthorized! if cannot?(params[:action].to_sym, options[:namespace])
+        end
+      end
+    end
+    
+  end
+end
+
+

data/lib/fume.rb

@@ -9,6 +9,7 @@ require 'fume/formtastic'
 require 'fume/smart_logger'
 require 'fume/logger_support'
 require 'fume/daemon'
+require 'fume/cancan'
 
 # module Fume
 #   def self.root

data/rails_generators/fume/simple_theme/templates/public/themes/simple_theme/simple-theme.css

@@ -438,8 +438,8 @@ ul.list li .item .avatar {
   width: 30px;
   height: 30px;
 }
-.ui-datepicker select.ui-datepicker-month { width: 45%; }
-.ui-datepicker select.ui-datepicker-year { width: 45%; }
+.ui-datepicker select.ui-datepicker-month { width: 46%; }
+.ui-datepicker select.ui-datepicker-year { width: 46%; }
 .ui-widget {
   font-size: 93%;
   line-height: 1;
@@ -459,7 +459,10 @@ body {
   font-family: helvetica, arial, sans-serif;
 }
 #header_wrapper { background: #36393d; }
-#header h1 { font-weight: bold; }
+#header h1 {
+  font-weight: bold;
+  color: #ffffff;
+}
 #header h1 a { color: #ffffff; }
 #main .block .content { background: #ffffff; }
 #main .block .content h2 { font-weight: bold; }

data/rails_generators/fume/simple_theme/templates/public/themes/simple_theme/simple-theme.less

@@ -52,6 +52,7 @@ body {
 #header {
 	h1 {
 		font-weight: bold;
+		color: #FFF;
 
 		a {
 			color: #FFF;

data/spec/fume/cancan_spec.rb

@@ -0,0 +1,13 @@
+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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Sunteya
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +08:00
+date: 2010-04-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,14 +83,28 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: cancan
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -100,7 +114,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: 
 email: Sunteya@gmail.com
 executables: []
@@ -118,6 +132,7 @@ files:
 - fume.gemspec
 - lib/fume.rb
 - lib/fume/authlogic.rb
+- lib/fume/cancan.rb
 - lib/fume/daemon.rb
 - lib/fume/formtastic.rb
 - lib/fume/logger_support.rb
@@ -165,6 +180,7 @@ files:
 - rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.ba-bbq-1.2.1.js
 - rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.corner-2.09.js
 - rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.timepicker-0.2.1.js
+- spec/fume/cancan_spec.rb
 - spec/fume/daemon_spec.rb
 - spec/fume/logger_support_spec.rb
 - spec/fume/smart_logger_spec.rb
@@ -202,6 +218,7 @@ signing_key:
 specification_version: 3
 summary: a simple rails scaffold.
 test_files: 
+- spec/fume/cancan_spec.rb
 - spec/fume/daemon_spec.rb
 - spec/fume/logger_support_spec.rb
 - spec/fume/smart_logger_spec.rb