brick_layer 0.10.1 → 0.10.2

data/app/controllers/brick_layer/base_controller.rb

@@ -1,11 +1,19 @@
 class BrickLayer::BaseController < ApplicationController
   layout 'brick_layer/layouts/brick_layer_layout'
+  protect_from_forgery
+
+  helper_method :current_administrator
+
   before_filter :authenticate
 
   def authenticate
     request.format.html? ? authenticate_with_session : filter_public_responses
   end
 
+  def current_administrator
+    @current_administrator ||= BrickLayer::Administrator.find(session[:administrator_id]) if session[:administrator_id]  
+  end 
+
   private
 
   def authenticate_with_session

data/app/controllers/brick_layer/sessions_controller.rb

@@ -1,15 +1,16 @@
-class BrickLayer::SessionsController < ApplicationController
+class BrickLayer::SessionsController < BrickLayer::BaseController
   layout 'brick_layer/layouts/session_layout'
+  skip_before_filter  :verify_authenticity_token
+  skip_before_filter  :authenticate
 
   def new
   end
 
   def create
     admin = BrickLayer::Administrator.authenticate(params[:username], params[:password])
-
     if admin
-      session[:administrator_id] = admin.id  
-      redirect_to root_url, :notice => "Logged in!"  
+      session[:administrator_id] = admin.id.to_s
+      redirect_to root_url, :notice => "Logged in!"
     else  
       flash.now.alert = "Invalid username or password"  
       render "new"  

data/app/helpers/brick_layer/data_set_helper.rb

@@ -80,9 +80,9 @@ module BrickLayer::DataSetHelper
 
     data_type = :file if data_type == :image
     type = data_type || :string
-    
+
     options = klass.custom_field_options[attribute.to_sym]
-    
+
     if options && !options.keys.blank?
       return form.input(attribute.to_sym, options.merge(:as => type))
     else
@@ -90,7 +90,7 @@ module BrickLayer::DataSetHelper
     end
     
   rescue NameError
-    ""
+    form.input(attribute.to_sym, :as => type)
   end
   
   # This is used to format a field with a relationship

data/app/views/brick_layer/administrators/index.html.haml

@@ -3,7 +3,7 @@
 %p= link_to "Add Administrator", new_administrator_path
 
 - if @administrators.blank?
-  %p== Currently there are not any administrators in the system
+  %p Currently there aren't any administrators in the system
 - else
   %table
     %thead

data/app/views/brick_layer/data_sets/new.html.haml

@@ -1,4 +1,4 @@
-%h1== New #{@model_constant.to_s.titlecase} Object
+%h1== New #{@model_constant.to_s.titlecase}
 
 = simple_form_for @model_constant.new, :as => :data_set, :url => data_sets_path(:model => params[:model]), :multipart => true do |f|
   = render :partial => "form", :locals => { :f => f }

data/lib/version.rb

@@ -1,3 +1,3 @@
 module BrickLayer
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick_layer
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70276030557760 !ruby/object:Gem::Requirement
+  requirement: &70175158000000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70276030557760
+  version_requirements: *70175158000000
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70276030557280 !ruby/object:Gem::Requirement
+  requirement: &70175157999520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276030557280
+  version_requirements: *70175157999520
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70276030556800 !ruby/object:Gem::Requirement
+  requirement: &70175157999020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276030556800
+  version_requirements: *70175157999020
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70276030556320 !ruby/object:Gem::Requirement
+  requirement: &70175157998520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70276030556320
+  version_requirements: *70175157998520
 - !ruby/object:Gem::Dependency
   name: mongoid_nested_set
-  requirement: &70276030555840 !ruby/object:Gem::Requirement
+  requirement: &70175157998020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276030555840
+  version_requirements: *70175157998020
 - !ruby/object:Gem::Dependency
   name: mongoid-ancestry
-  requirement: &70276030555360 !ruby/object:Gem::Requirement
+  requirement: &70175157997480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276030555360
+  version_requirements: *70175157997480
 - !ruby/object:Gem::Dependency
   name: mongoid_fulltext
-  requirement: &70276030554880 !ruby/object:Gem::Requirement
+  requirement: &70175157996980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70276030554880
+  version_requirements: *70175157996980
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70276030554360 !ruby/object:Gem::Requirement
+  requirement: &70175157996440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276030554360
+  version_requirements: *70175157996440
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70276030553440 !ruby/object:Gem::Requirement
+  requirement: &70175157995920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70276030553440
+  version_requirements: *70175157995920
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &70276030552600 !ruby/object:Gem::Requirement
+  requirement: &70175157995420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70276030552600
+  version_requirements: *70175157995420
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70276030552080 !ruby/object:Gem::Requirement
+  requirement: &70175157994920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70276030552080
+  version_requirements: *70175157994920
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70276030551540 !ruby/object:Gem::Requirement
+  requirement: &70175157994440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70276030551540
+  version_requirements: *70175157994440
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70276030551120 !ruby/object:Gem::Requirement
+  requirement: &70175157994040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030551120
+  version_requirements: *70175157994040
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70276030550600 !ruby/object:Gem::Requirement
+  requirement: &70175157993580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030550600
+  version_requirements: *70175157993580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70276030550060 !ruby/object:Gem::Requirement
+  requirement: &70175157993040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70276030550060
+  version_requirements: *70175157993040
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70276030549620 !ruby/object:Gem::Requirement
+  requirement: &70175157992600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030549620
+  version_requirements: *70175157992600
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &70276030549160 !ruby/object:Gem::Requirement
+  requirement: &70175157992120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030549160
+  version_requirements: *70175157992120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70276030548680 !ruby/object:Gem::Requirement
+  requirement: &70175157991700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030548680
+  version_requirements: *70175157991700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70276030547800 !ruby/object:Gem::Requirement
+  requirement: &70175157991280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030547800
+  version_requirements: *70175157991280
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &70276030547020 !ruby/object:Gem::Requirement
+  requirement: &70175157990840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030547020
+  version_requirements: *70175157990840
 - !ruby/object:Gem::Dependency
   name: wirble
-  requirement: &70276030546340 !ruby/object:Gem::Requirement
+  requirement: &70175157990400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030546340
+  version_requirements: *70175157990400
 - !ruby/object:Gem::Dependency
   name: looksee
-  requirement: &70276030545760 !ruby/object:Gem::Requirement
+  requirement: &70175157989600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276030545760
+  version_requirements: *70175157989600
 description: Content Management and Endpoint Rails Service Engine
 email: 
 executables: []