app_frame 0.5.5 → 0.5.6

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'bootstrap-sass', '~> 2.3.1.0'
+gem 'bootstrap-sass', '~> 2.3.2.1'
 gem 'devise'
 gem 'display_for', '0.1.12'
 gem 'haml-rails'
@@ -17,10 +17,10 @@ gem 'squeel'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :test, :development do
-  gem "rails", "~> 3.2.13"
+  gem "rails", "~> 3.2.14"
   gem "rspec-rails"
   gem "bundler", '~> 1.3.4'
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 1.8.7"
   gem "simplecov"
   gem 'log_buddy'
 end

data/Gemfile.lock

@@ -1,18 +1,18 @@
 GIT
   remote: git://github.com/ryanb/nested_form.git
-  revision: 8655e352c8f8dd26a6918e72f6d152954b65676a
+  revision: 42028bc06e72a848d297edc1467a969a7c9def57
   specs:
-    nested_form (0.3.1)
+    nested_form (0.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -20,69 +20,100 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    addressable (2.3.5)
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.3.1.0)
+    bcrypt-ruby (3.1.1)
+    bootstrap-sass (2.3.2.1)
       sass (~> 3.2)
     builder (3.0.4)
-    devise (2.2.3)
+    devise (3.0.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
-    diff-lcs (1.1.3)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
+    diff-lcs (1.2.4)
     display_for (0.1.12)
     erubis (2.7.0)
-    git (1.2.5)
-    haml (3.1.7)
-    haml-rails (0.3.5)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    haml (4.0.3)
+      tilt
+    haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
+      haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    has_scope (0.5.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    inherited_resources (1.3.1)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6)
-    jeweler (1.8.4)
+    has_scope (0.6.0.rc)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
+    hashie (2.0.5)
+    highline (1.6.19)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.5)
+    inherited_resources (1.4.1)
+      has_scope (~> 0.6.0.rc)
+      responders (~> 1.0.0.rc)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     log_buddy (0.7.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    multi_json (1.7.1)
+    mime-types (1.24)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
     nested_set (1.7.1)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     orm_adapter (0.4.0)
-    polyamorous (0.5.0)
-      activerecord (~> 3.0)
+    polyamorous (0.6.3)
+      activerecord (>= 3.0)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -91,47 +122,47 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    responders (0.9.3)
-      railties (~> 3.1)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+    responders (1.0.0.rc)
+      railties (>= 3.2, < 5)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    sass (3.2.5)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sass (3.2.10)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.3.1)
-      sass-rails (>= 3.2)
+    select2-rails (3.4.8)
+      sass-rails
       thor (~> 0.14)
     settingslogic (2.0.9)
-    simple_form (2.0.4)
+    simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     simplecov (0.7.1)
@@ -143,35 +174,35 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    squeel (1.0.18)
-      activerecord (~> 3.0)
-      activesupport (~> 3.0)
-      polyamorous (~> 0.5.0)
-    thor (0.17.0)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    squeel (1.1.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      polyamorous (~> 0.6.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass (~> 2.3.1.0)
+  bootstrap-sass (~> 2.3.2.1)
   bundler (~> 1.3.4)
   devise
   display_for (= 0.1.12)
   haml-rails
   inherited_resources
-  jeweler (~> 1.8.4)
+  jeweler (~> 1.8.7)
   kaminari
   log_buddy
   nested_form!
   nested_set
-  rails (~> 3.2.13)
+  rails (~> 3.2.14)
   rspec-rails
   sass-rails
   select2-rails

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/app/helpers/app_frame/bootstrap_helper.rb

@@ -28,8 +28,7 @@ module AppFrame
       content = "".html_safe
       content += content_tag(:div, capture(&block), :class => 'page-actions') if block_given?
       content += content_tag(:h1, title)
-      
-      content_tag(:div, content, :class => 'page-header')
+      content
     end
     
   end

data/app/helpers/app_frame/resources_helper.rb

@@ -31,12 +31,6 @@ module AppFrame::ResourcesHelper
   def parent_resource_name
     parent_resource_class.model_name.human
   end
-
-  def controller_namespaces
-    result = controller.class.to_s.split('::')
-    result.pop
-    result.map(&:underscore)
-  end
   
   def namespaced(string)
     if controller_namespaces.any?

data/app/views/application/_page_header.html.haml

@@ -0,0 +1 @@
+= yield :page_header

data/app/views/application/edit.html.haml

@@ -1,5 +1,7 @@
-= page_header resource.to_s do
-  = content_locale_switch(resource)
+- content_for :page_header do
+  = page_header resource.to_s do
+    = content_locale_switch(resource)
+  
 = simple_nested_form_for resource_path_array, :html => {:class => 'form-inline' } do |f|
   = hidden_field_tag :content_locale, params[:content_locale] if params[:content_locale]
   = render 'form', :f => f

data/app/views/application/index.html.haml

@@ -1,5 +1,8 @@
-= page_header resource_name.pluralize
+- content_for :page_header do
+  = page_header resource_name.pluralize
+
 = render 'toolbar'
+
 - if collection
   = scope_nav
   = table_for(controller_namespaces + [resource_class], collection) do |t|

data/app/views/application/new.html.haml

@@ -1,4 +1,6 @@
-= page_header "New #{resource_name}"
+- content_for :page_header do
+  = page_header "New #{resource_name}"
+
 = simple_nested_form_for resource_path_array, :html => {:class => 'form-inline' } do |f|
   = hidden_field_tag :content_locale, params[:content_locale] if params[:content_locale] 
   = render 'form', :f => f

data/app/views/application/show.html.haml

@@ -1,4 +1,6 @@
-= page_header resource.to_s
+- content_for :page_header do
+  = page_header resource.to_s
+
 = view_for resource_path_array do |s|
   = render 'show', :s => s
 

data/app/views/layouts/app_frame/default.html.haml

@@ -21,12 +21,16 @@
     #main.container-fluid
       - if sidebar.present?
         .content
+          .page-header
+            = render 'page_header'
           = render 'sub_menu'
           = render 'flashes'
           = yield
         .sidebar
           = sidebar
       - else
+        .page-header
+          = render 'page_header'      
         = render 'sub_menu'      
         = render 'flashes'
         = yield

data/app_frame.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "app_frame"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2013-08-23"
+  s.date = "2013-08-25"
   s.description = "An app framework"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "app/views/application/_flashes.html.haml",
     "app/views/application/_form.html.haml",
     "app/views/application/_head.html.haml",
+    "app/views/application/_page_header.html.haml",
     "app/views/application/_secondary_menu.html.haml",
     "app/views/application/_show.html.haml",
     "app/views/application/_sidebar.html.haml",
@@ -97,7 +98,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bootstrap-sass>, ["~> 2.3.1.0"])
+      s.add_runtime_dependency(%q<bootstrap-sass>, ["~> 2.3.2.1"])
       s.add_runtime_dependency(%q<devise>, [">= 0"])
       s.add_runtime_dependency(%q<display_for>, ["= 0.1.12"])
       s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
@@ -110,14 +111,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<simple_form>, [">= 0"])
       s.add_runtime_dependency(%q<select2-rails>, [">= 0"])
       s.add_runtime_dependency(%q<squeel>, [">= 0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.2.13"])
+      s.add_development_dependency(%q<rails>, ["~> 3.2.14"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.3.4"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<log_buddy>, [">= 0"])
     else
-      s.add_dependency(%q<bootstrap-sass>, ["~> 2.3.1.0"])
+      s.add_dependency(%q<bootstrap-sass>, ["~> 2.3.2.1"])
       s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<display_for>, ["= 0.1.12"])
       s.add_dependency(%q<haml-rails>, [">= 0"])
@@ -130,15 +131,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simple_form>, [">= 0"])
       s.add_dependency(%q<select2-rails>, [">= 0"])
       s.add_dependency(%q<squeel>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.2.13"])
+      s.add_dependency(%q<rails>, ["~> 3.2.14"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.3.4"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<log_buddy>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bootstrap-sass>, ["~> 2.3.1.0"])
+    s.add_dependency(%q<bootstrap-sass>, ["~> 2.3.2.1"])
     s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<display_for>, ["= 0.1.12"])
     s.add_dependency(%q<haml-rails>, [">= 0"])
@@ -151,10 +152,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simple_form>, [">= 0"])
     s.add_dependency(%q<select2-rails>, [">= 0"])
     s.add_dependency(%q<squeel>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.2.13"])
+    s.add_dependency(%q<rails>, ["~> 3.2.14"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.3.4"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<log_buddy>, [">= 0"])
   end

data/lib/app_frame/controller_methods.rb

@@ -3,16 +3,12 @@ module AppFrame
   module ControllerMethods
     extend ActiveSupport::Concern
   
-    def controller
-      self
-    end
-  
     module ClassMethods
       def app_frame(options = {})
         layout "#{AppFrame::theme}/#{options[:layout] || 'default'}"
         unless options[:resource] == false
           inherit_resources
-          include AppFrame::ResourcesHelper
+          include ResourceSupport
           include PaginationSupport
           include HasManySupport
           include SearchSupport
@@ -20,6 +16,20 @@ module AppFrame
       end
     end
     
+    module ResourceSupport
+      extend ActiveSupport::Concern
+      
+      included do
+        helper_method :controller_namespaces
+      end   
+      
+      def controller_namespaces
+        result = self.class.to_s.split('::')
+        result.pop
+        result.map(&:underscore)
+      end           
+    end
+    
     module SearchSupport
       extend ActiveSupport::Concern
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_frame
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
+        version: 2.3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.1.0
+        version: 2.3.2.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -282,7 +282,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -362,6 +362,7 @@ files:
 - app/views/application/_flashes.html.haml
 - app/views/application/_form.html.haml
 - app/views/application/_head.html.haml
+- app/views/application/_page_header.html.haml
 - app/views/application/_secondary_menu.html.haml
 - app/views/application/_show.html.haml
 - app/views/application/_sidebar.html.haml
@@ -407,7 +408,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1265302220552006335
+      hash: -1054025559741133892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: