contour 1.3.0 → 2.0.0.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGRmNTYzMzNhNzdmZTkwZGU2YjdmZTVmNWRhZjdjYjQyMjZmZDlmNQ==
+    MDJhYTFmMzI2ZjY4MzA5YjRjYTA4MTFmY2VkMTY1YTgyZTc3ZWExYw==
   data.tar.gz: !binary |-
-    Zjk5MTZiMjI0MTNjZDM3Y2Q0NGNmYzBjMGNkMmU3MTc3NmRjMjUxNA==
+    MTI5ZmNlODk1NjM3NmVjMTNlOWY1OTI4NDNjN2RmZTVhMjNhOTAwNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDIxM2JiYTI3Njg3ODFjYThjNjY0YmJkMGVlMGZhM2MyZjdjM2QyZTg1Njkx
-    NTA2NjhmZTQyYjc5ZWU2OTI2NTdjOWZiNDFjODIwMmExZDJkN2ZiNjVjN2Nj
-    YjE4OTEwMDkyMGNiYjk5ZTZkNGEzYWFmYTEwZTEzMTBlMjk5OTM=
+    NmQxZjZlNWNlOGNiNjgyMGRjOTE1NzhjODQzMWNkMDJiNjc4ZDI4NDIxMjgz
+    YzEzOTE4ZmZmMGE2ZGJiNjgzYjg1MjBkYjY5OTA5ZjY4ODFlOWQzZDc2MjEw
+    MjA5ZDQ3NmVmZjdiMTcyZmRjYWNlNDdiMjhhOWM0MzMzZGE3NTA=
   data.tar.gz: !binary |-
-    NTU3ZDg0NmE2MzA5YTVjNDVhZDA5ZjM5YWI0NjI1ODBhMDdkMTdkYjk1ZGE0
-    ODdhMTE3MWIzYTJjMmJjMTk1NjEzOWNlYmJmMTZmMmYwY2NhY2YxMGY1YjBh
-    YzM5MDk1NzFmMmE0NTg1NTg3NDlmZDNmZGNhMDJkNjMyN2UzMjc=
+    YjUyOTRhYTRiZmQ5ZTM2ZWNhN2IxOTE0YTQzZDdmMmI2MGY3MTU1MzBhYWQ4
+    YTkwZTY2N2QzZTY5MDRlMmI1ZjE4M2I0ZTU1ZjA0NzZmMjQ2NDM0YTRhMzdi
+    NDY2MDNmNGVmNjI4MmVjMDEwZmIwYjJlNjg5YmNkMGZiYTQ3ZDE=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.0
+
+### Enhancements
+- **Gem Changes**
+  - Updated to Rails 4.0.0.beta1
+
 ## 1.3.0 (February 26, 2013)
 
 ### Breaking Changes

data/README.md

@@ -22,7 +22,7 @@ gem 'contour'
 
 ## Getting started
 
-Make sure you have Rails 3.2.12
+Make sure you have Rails 4.0.0
 
 ```console
 rails -v
@@ -35,7 +35,7 @@ cd blank_rails_project
 Modify `Gemfile` and add
 
 ```ruby
-gem 'contour', '~> 1.2.1'
+gem 'contour', '~> 2.0.0'
 ```
 
 Run Bundle install
@@ -70,12 +70,6 @@ Create a sample controller
 rails generate controller welcome index --skip-stylesheets
 ```
 
-Remove the `public/index.html`
-
-```console
-rm public/index.html
-```
-
 Add the following line to your `app/controllers/application_controller.rb`
 
 ```ruby
@@ -111,36 +105,21 @@ root to: 'welcome#index'
 Add the following to the top of your `app/controllers/welcome_controller.rb`
 
 ```ruby
-before_filter :authenticate_user!
+before_action :authenticate_user!
 ```
 
 Add the following to your `app/models/user.rb`
 
 ```ruby
-# Model Relationships
-has_many :authentications
-
-def apply_omniauth(omniauth)
-  unless omniauth['info'].blank?
-    self.email = omniauth['info']['email'] if email.blank?
-  end
-  self.password = Devise.friendly_token[0,20] if self.password.blank?
-  authentications.build( provider: omniauth['provider'], uid: omniauth['uid'] )
-end
-
-def password_required?
-  (authentications.empty? || !password.blank?) && super
-end
+# Concerns
+include Contourable
 ```
 
 Add the following to your `app/models/authentication.rb`
 
 ```ruby
-belongs_to :user
-
-def provider_name
-  OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize
-end
+# Concerns
+include ContourAuthenticatable
 ```
 
 Edit `config/initializers/devise.rb` to use `:get` for devise `sign_out_via`
@@ -181,7 +160,7 @@ rails g scaffold Item name:string description:text user_id:integer bought_date:d
 Add a current `scope` and `belongs_to` relationship to `app/models/item.rb`
 
 ```ruby
-scope :current, conditions: { }
+scope :current, -> { all }
 
 belongs_to :user
 ```
@@ -189,7 +168,7 @@ belongs_to :user
 Add a current `scope` and `has_many` relationship to `app/models/user.rb` along with name placeholder
 
 ```ruby
-scope :current, conditions: { }
+scope :current, -> { all }
 
 has_many :items
 

data/Rakefile

@@ -1,35 +1,17 @@
 #!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Contour'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('CHANGELOG.rdoc')
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run contour tests'
+task default: :test
 
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -37,5 +19,12 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+desc 'Generate documentation for Contour'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Contour'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 
-task default: :test

data/app/assets/javascripts/contour/global.js.coffee

@@ -17,38 +17,39 @@
 @nonStandardClick = (event) ->
   event.which > 1 or event.metaKey or event.ctrlKey or event.shiftKey or event.altKey
 
-jQuery ->
-  $(".timepicker").timepicker
-    showMeridian: false
-    showSeconds: true
-    defaultTime: false
-  $(".datepicker").datepicker('remove')
-  $(".datepicker").datepicker( autoclose: true )
-
-  $(document).on('change', '.datepicker', () ->
+$(document)
+  .on('change', '.datepicker', () ->
     try
       $(this).val($.datepicker.formatDate('mm/dd/yy', $.datepicker.parseDate('mm/dd/yy', $(this).val())))
     catch error
       # Nothing
   )
-
-  $(document).on('click', ".pagination a, .page a, .next a, .prev a", () ->
+  .on('click', ".pagination a, .page a, .next a, .prev a", () ->
     return false if $(this).parent().is('.active, .disabled, .per_page')
     $.get(this.href, null, null, "script")
     false
   )
-
-  $(document).on("click", ".per_page a", () ->
+  .on("click", ".per_page a", () ->
     object_class = $(this).data('object')
     $.get($("#"+object_class+"_search").attr("action"), $("#"+object_class+"_search").serialize() + "&"+object_class+"_per_page="+ $(this).data('count'), null, "script")
     false
   )
-
-  $(document).on('click', '[data-object~="order"]', () ->
+  .on('click', '[data-object~="order"]', () ->
     $('#order').val($(this).data('order'))
     $($(this).data('form')).submit()
     false
   )
 
+@ready = () ->
+  $(".timepicker").timepicker
+    showMeridian: false
+    showSeconds: true
+    defaultTime: false
+  $(".datepicker").datepicker('remove')
+  $(".datepicker").datepicker( autoclose: true )
+
   # Load forms on page load
   $('[data-object~="form-load"]').submit()
+
+$(document).ready(ready)
+# $(document).on('page:load', ready)

data/app/controllers/contour/authentications_controller.rb

@@ -1,4 +1,6 @@
 class Contour::AuthenticationsController < ApplicationController
+  skip_before_action :verify_authenticity_token, only: :create
+
   def index
     @authentications = current_user.authentications if current_user
   end

data/app/models/authentication.rb

@@ -1,7 +1,4 @@
 class Authentication < ActiveRecord::Base
-  belongs_to :user
-
-  def provider_name
-    OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize
-  end
+  # Concerns
+  include ContourAuthenticatable
 end

data/app/models/concerns/contour_authenticatable.rb

@@ -0,0 +1,12 @@
+module ContourAuthenticatable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :user
+  end
+
+  def provider_name
+    OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize
+  end
+
+end

data/app/models/concerns/contourable.rb

@@ -0,0 +1,19 @@
+module Contourable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :authentications
+  end
+
+  def apply_omniauth(omniauth)
+    unless omniauth['info'].blank?
+      self.email = omniauth['info']['email'] if email.blank?
+    end
+    self.password = Devise.friendly_token[0,20] if self.password.blank?
+    authentications.build( provider: omniauth['provider'], uid: omniauth['uid'] )
+  end
+
+  def password_required?
+    (authentications.empty? || !password.blank?) && super
+  end
+end

data/app/views/contour/layouts/application.html.erb

@@ -12,7 +12,7 @@
       <script src="//html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
 
-    <%= stylesheet_link_tag    "application", media: "all" %>
+    <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   </head>
   <body>
     <div class="navbar navbar-inverse navbar-fixed-top">
@@ -29,7 +29,7 @@
       <%= yield %>
     </div>
 
-    <%= javascript_include_tag "application" %>
+    <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
     <%= javascript_tag "var root_url='#{request.script_name + '/'}';var auth_token='#{form_authenticity_token}';" %>
   </body>
 </html>

data/config/routes.rb

@@ -1,9 +1,9 @@
 Rails.application.routes.draw do
 
-  match '/auth/failure' => 'contour/authentications#failure'
-  match '/auth/:provider/callback' => 'contour/authentications#create'
-  match '/auth/:provider' => 'contour/authentications#passthru'
-  match '/contour' => 'contour/samples#index'
+  get '/auth/failure' => 'contour/authentications#failure'
+  post '/auth/:provider/callback' => 'contour/authentications#create'
+  get '/auth/:provider' => 'contour/authentications#passthru'
+  get '/contour' => 'contour/samples#index'
 
   resources :authentications, controller: 'contour/authentications'
 

data/contour.gemspec

@@ -17,15 +17,17 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/remomueller'
   s.summary     = 'Basic Rails framework files and assets for layout and authentication'
   s.description = 'Basic Rails Framework files and assets for layout and authentication'
+  s.license     = 'CC BY-NC-SA 3.0'
 
   s.platform = Gem::Platform::RUBY
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["CHANGELOG.md", "contour.gemspec", "LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails',                   '~> 3.2.12'
+  s.add_dependency 'rails',                   '~> 4.0.0.beta1'
   s.add_dependency 'jquery-rails',            '~> 2.2.1'
-  s.add_dependency 'devise',                  '~> 2.2.3'
+  s.add_dependency 'coffee-rails',            '~> 4.0.0.beta1'
+  # s.add_dependency 'devise',                  '~> 2.2.3' # Currently in Gemfile
   s.add_dependency 'omniauth',                '~> 1.1.3'
   s.add_dependency 'omniauth-cas',            '~> 1.0.1'
   s.add_dependency 'omniauth-facebook',       '~> 1.4.1'

data/lib/contour/version.rb

@@ -1,9 +1,9 @@
 module Contour
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 3
+    MAJOR = 2
+    MINOR = 0
     TINY = 0
-    BUILD = nil # nil, "pre", "rc", "rc2"
+    BUILD = "beta.1" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/generators/contour/scaffold/templates/_paginate.html.erb

@@ -1,4 +1,4 @@
-<%%= render partial: 'contour/layouts/per_page', locals: { type: '<%= resource_name_plural %>', per_page: 20, object_count: @<%= resource_name %>_count } %>
+<%%= render partial: 'contour/layouts/per_page', locals: { type: '<%= resource_name_plural %>', per_page: 20, object_count: @<%= resource_name_plural %>.total_count } %>
 
 <table class="table table-striped table-bordered" style="width:100%">
   <thead>

data/lib/generators/contour/scaffold/templates/controller.rb

@@ -1,60 +1,39 @@
 class <%= resource_class_name_plural %>Controller < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
+  before_action :set_<%= resource_name %>, only: [:show, :edit, :update, :destroy]
 
   # GET /<%= resource_name_plural %>
   # GET /<%= resource_name_plural %>.json
   def index
-    <%= resource_name %>_scope = <%= resource_class_name %>.current
     @order = scrub_order(<%= resource_class_name %>, params[:order], "<%= resource_name_plural %>.name")
-    <%= resource_name %>_scope = <%= resource_name %>_scope.order(@order)
-    @<%= resource_name %>_count = <%= resource_name %>_scope.count
-    @<%= resource_name_plural %> = <%= resource_name %>_scope.page(params[:page]).per( 20 )
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-      format.json { render json: @<%= resource_name_plural %> }
-    end
+    @<%= resource_name_plural %> = <%= resource_class_name %>.current.order(@order).page(params[:page]).per( 20 )
   end
 
   # GET /<%= resource_name_plural %>/1
   # GET /<%= resource_name_plural %>/1.json
   def show
-    @<%= resource_name %> = <%= resource_class_name %>.current.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @<%= resource_name %> }
-    end
   end
 
   # GET /<%= resource_name_plural %>/new
-  # GET /<%= resource_name_plural %>/new.json
   def new
     @<%= resource_name %> = <%= resource_class_name %>.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @<%= resource_name %> }
-    end
   end
 
   # GET /<%= resource_name_plural %>/1/edit
   def edit
-    @<%= resource_name %> = <%= resource_class_name %>.current.find(params[:id])
   end
 
   # POST /<%= resource_name_plural %>
   # POST /<%= resource_name_plural %>.json
   def create
-    @<%= resource_name %> = <%= resource_class_name %>.new(post_params)
+    @<%= resource_name %> = <%= resource_class_name %>.new(<%= resource_name %>_params)
 
     respond_to do |format|
       if @<%= resource_name %>.save
         format.html { redirect_to @<%= resource_name %>, notice: '<%= resource_class_name %> was successfully created.' }
-        format.json { render json: @<%= resource_name %>, status: :created, location: @<%= resource_name %> }
+        format.json { render action: 'show', status: :created, location: @<%= resource_name %> }
       else
-        format.html { render action: "new" }
+        format.html { render action: 'new' }
         format.json { render json: @<%= resource_name %>.errors, status: :unprocessable_entity }
       end
     end
@@ -63,14 +42,12 @@ class <%= resource_class_name_plural %>Controller < ApplicationController
   # PUT /<%= resource_name_plural %>/1
   # PUT /<%= resource_name_plural %>/1.json
   def update
-    @<%= resource_name %> = <%= resource_class_name %>.current.find(params[:id])
-
     respond_to do |format|
-      if @<%= resource_name %>.update_attributes(post_params)
+      if @<%= resource_name %>.update(<%= resource_name %>_params)
         format.html { redirect_to @<%= resource_name %>, notice: '<%= resource_class_name %> was successfully updated.' }
         format.json { head :no_content }
       else
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: @<%= resource_name %>.errors, status: :unprocessable_entity }
       end
     end
@@ -79,7 +56,6 @@ class <%= resource_class_name_plural %>Controller < ApplicationController
   # DELETE /<%= resource_name_plural %>/1
   # DELETE /<%= resource_name_plural %>/1.json
   def destroy
-    @<%= resource_name %> = <%= resource_class_name %>.current.find(params[:id])
     @<%= resource_name %>.destroy
 
     respond_to do |format|
@@ -89,29 +65,32 @@ class <%= resource_class_name_plural %>Controller < ApplicationController
   end
 
   private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_<%= resource_name %>
+      @<%= resource_name %> = <%= resource_class_name %>.current.find(params[:id])
+    end
 
-  def post_params
-    params[:<%= resource_name %>] ||= {}
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def <%= resource_name %>_params
+      params[:<%= resource_name %>] ||= {}
 
-    [<%= date_columns.collect{|c| ":#{c.name}"}.join(', ') %>].each do |date|
-      params[:<%= resource_name %>][date] = parse_date(params[:<%= resource_name %>][date])
-    end
+      [<%= date_columns.collect{|c| ":#{c.name}"}.join(', ') %>].each do |date|
+        params[:<%= resource_name %>][date] = parse_date(params[:<%= resource_name %>][date])
+      end
 
-    params[:<%= resource_name %>].slice(
-      <%= columns.collect{|c| ":#{c.name}"}.join(', ') %>
-    )
-  end
+      params.require(:<%= resource_name %>).permit(<%= columns.collect{|c| ":#{c.name}"}.join(', ') %>)
+    end
 
-  # Scrub order and parse_date can be moved to your ApplicationController
-  def scrub_order(model, params_order, default_order)
-    (params_column, params_direction) = params_order.to_s.strip.downcase.split(' ')
-    direction = (params_direction == 'desc' ? 'DESC' : nil)
-    column_name = (model.column_names.collect{|c| model.table_name + "." + c}.select{|c| c == params_column}.first)
-    order = column_name.blank? ? default_order : [column_name, direction].compact.join(' ')
-    order
-  end
+    # Scrub order and parse_date can be moved to your ApplicationController
+    def scrub_order(model, params_order, default_order)
+      (params_column, params_direction) = params_order.to_s.strip.downcase.split(' ')
+      direction = (params_direction == 'desc' ? 'DESC' : nil)
+      column_name = (model.column_names.collect{|c| model.table_name + "." + c}.select{|c| c == params_column}.first)
+      order = column_name.blank? ? default_order : [column_name, direction].compact.join(' ')
+      order
+    end
 
-  def parse_date(date_string, default_date = '')
-    date_string.to_s.split('/').last.size == 2 ? Date.strptime(date_string, "%m/%d/%y") : Date.strptime(date_string, "%m/%d/%Y") rescue default_date
-  end
+    def parse_date(date_string, default_date = '')
+      date_string.to_s.split('/').last.size == 2 ? Date.strptime(date_string, "%m/%d/%y") : Date.strptime(date_string, "%m/%d/%Y") rescue default_date
+    end
 end