neuron 0.0.13 → 0.1.0

data/lib/neuron.rb

@@ -3,23 +3,18 @@ require 'neuron/version'
 module Neuron
   autoload :Application,    'neuron/application'
   autoload :Authorization,  'neuron/authorization'
-  autoload :Controller,     'neuron/controller'
   autoload :Navigation,     'neuron/navigation'
   autoload :Railtie,        'neuron/railtie'
-  autoload :Resolver,       'neuron/resolver'
   autoload :Resources,      'neuron/resources'
   autoload :ShowFor,        'neuron/show_for'
-  autoload :View,           'neuron/view'
 
-  class << self
-    def setup!
-      Neuron::Controller.setup!
-      Neuron::View.setup!
-    end
+  def self.setup!
+    Neuron::Controller.setup!
+    Neuron::View.setup!
+  end
 
-    def path
-      File.expand_path('../..', __FILE__)
-    end
+  def self.path
+    File.expand_path('../..', __FILE__)
   end
 end
 

data/lib/neuron/controller.rb

@@ -12,11 +12,5 @@ module Neuron
         ActionController::Base.send(:include, Neuron::Authorization::Controller)  if defined?(::CanCan)
       end
     end
-
-    module ClassMethods
-      def append_neuron_view_path_resolver
-        append_view_path Neuron::Resolver.new
-      end
-    end
   end
 end

data/lib/neuron/railtie.rb

@@ -1,4 +1,6 @@
 require 'neuron'
+require 'neuron/controller'
+require 'neuron/view'
 require 'rails'
 require 'rails/engine'
 

data/lib/neuron/resources.rb

@@ -30,7 +30,6 @@ module Neuron
           prepend_before_filter :set_default_collection_scopes, only: [:index]
 
           inherit_resources
-          append_neuron_view_path_resolver
 
           if options[:order]
             order_scopes(options[:order])
@@ -61,11 +60,11 @@ module Neuron
             get_collection_ivar || begin
               results = end_of_association_chain
               if (params[:paginate] != "false") && applicable?(options[:if], true) && applicable?(options[:unless], false)
-                results = results.paginate(page: params[:page], per_page: params[:per_page])
+                results = results.page(params[:page]).per(params[:per_page])
                 headers['X-Pagination-TotalEntries']  = results.total_entries.to_s
                 headers['X-Pagination-TotalPages']    = results.total_pages.to_s
                 headers['X-Pagination-CurrentPage']   = results.current_page.to_s
-                headers['X-Pagination-PerPage']       = results.per_page.to_s
+                headers['X-Pagination-PerPage']       = results.limit_value.to_s
               end
               set_collection_ivar(results)
             end
@@ -148,8 +147,8 @@ module Neuron
         collection      ||= self.collection
         collection_name ||= self.resource_collection_name
         if collection.respond_to?(:total_pages)
-          start = 1 + (collection.current_page - 1) * collection.per_page
-          pagination = will_paginate(collection)
+          start = 1 + (collection.current_page - 1) * collection.limit_value
+          pagination = paginate(collection)
         else
           start = 1
           pagination = ''

data/lib/neuron/version.rb

@@ -1,3 +1,3 @@
 module Neuron
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

data/lib/neuron/view.rb

@@ -2,8 +2,6 @@ require 'neuron'
 
 module Neuron
   module View
-    extend ActiveSupport::Memoizable
-
     def self.setup!
       if defined?(::ActionView)
         ActionView::Base.send(:include, Neuron::View)
@@ -38,9 +36,10 @@ module Neuron
     end
 
     def human(klass, attribute = nil)
-      attribute ? klass.human_attribute_name(attribute) : klass.name.human
+      @human ||= {}
+      @human[klass] ||= {}
+      @human[klass][attribute] ||= attribute ? klass.human_attribute_name(attribute) : klass.name.human
     end
-    memoize :human
 
     # Build canonical url for given resource
     def canonical_url(resource, options = {})
@@ -70,9 +69,8 @@ module Neuron
     end
 
     def controller_i18n_scope
-      controller.controller_path.gsub(%r{/}, '.')
+      @controller_i18n_scope ||= controller.controller_path.gsub(%r{/}, '.')
     end
-    memoize :controller_i18n_scope
 
     def time(time, options = {})
       format        = options.delete(:format) { :short }

data/neuron.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'railties', '~> 3.0'
+  s.add_dependency 'railties', '~> 3.2'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,58 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: neuron
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - Alexander Semyonov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Code reused in many applications
-email: 
+email:
 - al@semyonov.us
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
-- app/views/defaults/_form.html.haml
-- app/views/defaults/edit.html.haml
-- app/views/defaults/index.atom.builder
-- app/views/defaults/index.html.haml
-- app/views/defaults/new.html.haml
-- app/views/defaults/update.js.erb
+- app/views/application/_form.html.haml
+- app/views/application/edit.html.haml
+- app/views/application/index.atom.builder
+- app/views/application/index.html.haml
+- app/views/application/new.html.haml
+- app/views/application/update.js.erb
 - app/views/shared/_flash_messages.html.haml
 - config/locales/neuron.en.yml
 - config/locales/neuron.ru.yml
@@ -62,39 +68,40 @@ files:
 - lib/neuron/controller.rb
 - lib/neuron/navigation.rb
 - lib/neuron/railtie.rb
-- lib/neuron/resolver.rb
 - lib/neuron/resources.rb
 - lib/neuron/show_for.rb
 - lib/neuron/show_for/helper.rb
 - lib/neuron/version.rb
 - lib/neuron/view.rb
 - neuron.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4151533389982554336
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 4151533389982554336
 requirements: []
-
 rubyforge_project: neuron
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tools for decrease code duplication in rails applications
 test_files: []
-

data/lib/neuron/resolver.rb

@@ -1,14 +0,0 @@
-require 'neuron'
-require 'action_view/template/resolver'
-
-module Neuron
-  class Resolver < ::ActionView::FileSystemResolver
-    def initialize
-      super(File.join(Neuron.path, 'app', 'views'))
-    end
-
-    def find_templates(name, prefix, partial, details)
-      super(name, 'defaults', partial, details)
-    end
-  end
-end