puffer 0.0.13 → 0.0.14

data/README.md

@@ -4,7 +4,7 @@ Puffer was created to help project owner or moderators view and edit all the pro
 
 ## Keyfeatures
 
-* Full rails integration. Puffer has no configs, just DSL to create interfaces. And this DLS depends on rails convensions.
+* Full rails integration. Puffer has no configs, just DSL to create interfaces. And this DSL depends on rails convensions.
 * Flexibility. Puffer designed to be as flexible as possible, so you can create your own modules easily.
 * I18n. Surely.
 * Bla bla
@@ -147,3 +147,4 @@ namespace :moderator do
   resources :posts
 end
 </pre>
+

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/puffer/controller/helpers.rb

@@ -5,24 +5,11 @@ module Puffer
       def self.included base
         base.class_eval do
           include InstanceMethods
-          extend ClassMethods
 
           helper_method :resource_session, :puffer_navigation, :sidebar_puffer_navigation, :resource, :record, :records
         end
       end
 
-      module ClassMethods
-
-        def model_name
-          @model_name ||= ((puffer? and configuration.model) || controller_name.singularize).to_s
-        end
-
-        def model
-          @model ||= model_name.classify.constantize
-        end
-
-      end
-
       module InstanceMethods
 
         def puffer_navigation
@@ -43,15 +30,6 @@ module Puffer
           end if puffer?
         end
 
-        def resource_session
-          postfix = params[:action] =~ /associated_/ ? params[:action] : ''
-          name = "#{resource.model_name}#{postfix}".to_sym
-          session[:resources] ||= {}
-          session[:resources][name] ||= {}
-          session[:resources][name][:boolean] ||= {}
-          session[:resources][name]
-        end
-
         def resource
           @resource ||= Puffer::Resource.new params, request
         end

data/lib/puffer/controller/mutate.rb

@@ -18,6 +18,14 @@ module Puffer
 
       module ClassMethods
 
+        def model_name
+          @model_name ||= ((puffer? and configuration.model) || controller_name.singularize).to_s
+        end
+
+        def model
+          @model ||= model_name.classify.constantize if model_name.present?
+        end
+
         def view_paths_fallbacks *args
           temp = Puffer::PathSet.new view_paths
           temp._fallbacks = args.flatten

data/lib/puffer/resource.rb

@@ -19,8 +19,8 @@ module Puffer
       @controller_name = controller.controller_name
       controller_segments = params.delete(:controller).split('/')
       @prefix = controller_segments.first
-      @model_name = controller.model_name
-      @model = controller.model
+      @model_name = controller.model_name if controller.puffer?
+      @model = controller.model if controller.puffer?
       @params = params
       @request = request
     end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-08}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +03:00
+date: 2011-02-08 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency