RubyGems - casein - Versions diffs - 3.1.11 → 4.0.0.beta1 - Mend

casein 3.1.11 → 4.0.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

data/app/helpers/casein/casein_helper.rb CHANGED

@@ -58,11 +58,11 @@ module Casein
     end
   	def casein_show_icon icon_name
-  		"<div class='icon'><img src='/casein/images/icons/#{icon_name}.png' alt='' /></div>".html_safe
+  		"<div class='icon'>".html_safe + image_tag("casein/icons/#{icon_name}.png", :alt => "") + "</div>".html_safe
   	end
   	def casein_show_row_icon icon_name
-  		"<div class='iconRow'><img src='/casein/images/icons/#{icon_name}.png' alt='' /></div>".html_safe
+      "<div class='iconRow'>".html_safe + image_tag("casein/icons/#{icon_name}.png", :alt => "") + "</div>".html_safe
   	end
   	# Styled form tag helpers

data/app/views/casein/users/index.html.erb CHANGED

@@ -21,7 +21,7 @@
 						<% confirm_message += "\n\nWARNING: This is your user account. You will be logged out if you proceed." %>
 					<% end %>
-					<%= link_to(casein_show_row_icon("delete"), casein_user_path(user), :method => :delete, :confirm => confirm_message) %>
+					<%= link_to(casein_show_row_icon("delete"), casein_user_path(user), :method => :delete, :data => { :confirm => confirm_message }) %>
 				<% end %>
 			</td>
 		</tr>

data/app/views/layouts/casein_auth.html.erb CHANGED

@@ -5,8 +5,8 @@
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 		<title>Welcome to <%= casein_config_website_name %></title>
-		<%= stylesheet_link_tag "/casein/stylesheets/login" %>
-		<%= javascript_include_tag "/casein/javascripts/jquery", "/casein/javascripts/login", "/casein/javascripts/rails" %>
+		<%= stylesheet_link_tag "casein/login" %>
+		<%= javascript_include_tag "casein/login" %>
 		<%= csrf_meta_tag %>
 	</head>
 	<body>
@@ -18,7 +18,7 @@
 		</div>
 		<div id="footer">
 			<p>Based on <%= link_to "Casein", "http://www.caseincms.com" %> <%= casein_get_short_version_string %> technology,
-			an open-source project initiated by <a href="http://www.spoiledmilk.dk">Spoiled Milk</a>.</p>
+			an open-source project.</p>
 		</div>
 	</body>
 </html>

data/config/routes.rb CHANGED

@@ -1,19 +1,19 @@
 Rails.application.routes.draw do
-  match "/admin" => redirect("/casein")
+  match "/admin" => redirect("/casein"), :via => :get
   namespace :casein do
     resources :users do
       member do
-        put :update_password, :reset_password
+        patch :update_password, :reset_password
       end
     end
     resource :user_session
     resource :password_reset, :only => [:create, :edit, :update]
-    match "/blank" => "casein#blank"
+    match "/blank" => "casein#blank", :via => :get
     root :to => "casein#index"
   end

data/lib/casein.rb CHANGED

@@ -1,3 +1,3 @@
-require 'casein/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'casein/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 4
 require 'will_paginate'
 require 'authlogic'

data/lib/casein/engine.rb CHANGED

@@ -4,6 +4,10 @@ require "rails"
 module Casein
   class Engine < Rails::Engine
+    initializer "casein.assets.precompile" do |app|
+      app.config.assets.precompile += %w(casein/login.js casein/login.css casein/casein.css casein/casein.js casein/custom.css.scss casein/custom.js casein/*.png casein/login/*.png casein/icons/*.png)
+    end
     rake_tasks do
       load "railties/tasks.rake"
     end

data/lib/generators/casein/install/USAGE CHANGED

	@@ -1 +1 @@
1	- Copies user configurable Casein files into the main project
1	+ Copies user-configurable Casein files into the main project

data/lib/generators/casein/install/install_generator.rb CHANGED

@@ -27,8 +27,8 @@ module Casein
         copy_file "public/robots.txt", "public/robots.txt"
         #blank stylesheets and JavaScript files
-  			copy_file "public/casein/stylesheets/custom.css", "public/casein/stylesheets/custom.css"
-  			copy_file "public/casein/javascripts/custom.js", "public/casein/javascripts/custom.js"
+  			copy_file "app/assets/stylesheets/casein/custom.css.scss", "app/assets/stylesheets/casein/custom.css.scss"
+  			copy_file "app/assets/javascripts/casein/custom.js", "app/assets/javascripts/casein/custom.js"
   			#migrations
   			migration_template 'db/migrate/casein_create_users.rb', "db/migrate/casein_create_users.rb"

data/lib/generators/casein/install/templates/{public/casein/javascripts → app/assets/javascripts/casein}/custom.js RENAMED

File without changes

data/lib/generators/casein/install/templates/{public/casein/stylesheets/custom.css → app/assets/stylesheets/casein/custom.css.scss} RENAMED

@@ -1,2 +1,2 @@
-/* CASEIN CUSTOM    	  															*/
+/* CASEIN CUSTOM */
 /* Use this file for your project-specific Casein CSS */

data/lib/generators/casein/install/templates/app/helpers/casein/config_helper.rb CHANGED

@@ -1,46 +1,46 @@
 module Casein
   module ConfigHelper
-  	# Text string containing the name of the website or client
-  	# Used in text and titles throughout Casein
+    # Text string containing the name of the website or client
+    # Used in text and titles throughout Casein
     def casein_config_website_name
-    	'Casein'
+      'Casein'
     end
-  	# URL to the logo used for the login screen and top banner - it should be a transparent PNG
+    # URL to the logo used for the login screen and top banner - it should be a transparent PNG
     def casein_config_logo
-    	'/casein/images/casein.png'
+      'casein/casein.png'
     end
-  	# The server hostname where Casein will run
+    # The server hostname where Casein will run
     def casein_config_hostname
       if ENV['RAILS_ENV'] == 'production'
         'http://www.caseincms.com'
       else
-        'http://localhost:3000'
+        'http://0.0.0.0:3000'
       end
     end
-  	# The sender email address used for notifications
-  	def casein_config_email_from_address
-  		'donotreply@caseincms.com'
-  	end
-  	# The page that the user is shown when they login or click the logo
-  	# do not point this at casein/index!
-  	def casein_config_dashboard_url
-  		url_for :controller => :casein, :action => :blank
-  	end
-  	# A list of stylesheet files to include in the page head section
-  	def casein_config_stylesheet_includes
-  		%w[/casein/stylesheets/custom /casein/stylesheets/screen /casein/stylesheets/elements]
-  	end
-  	# A list of JavaScript files to include in the page head section
-  	def casein_config_javascript_includes
-  	  %w[/casein/javascripts/jquery /casein/javascripts/custom /casein/javascripts/casein /casein/javascripts/rails]
-  	end
+    # The sender email address used for notifications
+    def casein_config_email_from_address
+      'donotreply@caseincms.com'
+    end
+    # The page that the user is shown when they login or click the logo
+    # do not point this at casein/index!
+    def casein_config_dashboard_url
+      url_for :controller => :casein, :action => :blank
+    end
+    # A list of stylesheet files to include in the page head section
+    def casein_config_stylesheet_includes
+      %w[casein/custom casein/casein]
+    end
+    # A list of JavaScript files to include in the page head section
+    def casein_config_javascript_includes
+      %w[casein/custom casein/casein]
+    end
   end
 end

data/lib/generators/casein/scaffold/templates/controller.rb CHANGED

@@ -23,7 +23,7 @@ module Casein
     end
     def create
-      @<%= singular_name %> = <%= class_name %>.new params[:<%= singular_name %>]
+      @<%= singular_name %> = <%= class_name %>.new <%= singular_name %>_params
       if @<%= singular_name %>.save
         flash[:notice] = '<%= singular_name.humanize.capitalize %> created'
@@ -39,7 +39,7 @@ module Casein
       @<%= singular_name %> = <%= class_name %>.find params[:id]
-      if @<%= singular_name %>.update_attributes params[:<%= singular_name %>]
+      if @<%= singular_name %>.update_attributes <%= singular_name %>_params
         flash[:notice] = '<%= singular_name.humanize.capitalize %> has been updated'
         redirect_to casein_<%= @plural_route %>_path
       else
@@ -56,5 +56,17 @@ module Casein
       redirect_to casein_<%= @plural_route %>_path
     end
+    private
+      <%
+          permit_list = ""
+          attributes.each_with_index {|attribute|
+            permit_list += ", " unless permit_list.empty?
+            permit_list += ":#{attribute.name}"
+          }
+      %>
+      def <%= singular_name %>_params
+        params.require(:<%= singular_name %>).permit(<%= permit_list %>)
+      end
   end
 end

data/lib/generators/casein/scaffold/templates/views/_table.html.erb CHANGED

@@ -10,7 +10,7 @@
 		<tr class="<%%= 'even' if index.modulo(2) == 0 %> hover">
 			<% attributes.each do |attribute| %><td><%%= casein_table_cell_link <%= singular_name %>.<%= attribute.name %>, casein_<%= singular_name %>_path(<%= singular_name %>) %></td>
 			<% end %><td class="delete">
-				<%%= link_to(casein_show_row_icon("delete"), casein_<%= singular_name %>_path(<%= singular_name %>), :method => :delete, :confirm => "Are you sure you want to delete this <%= singular_name.humanize.downcase %>?") %>
+				<%%= link_to(casein_show_row_icon("delete"), casein_<%= singular_name %>_path(<%= singular_name %>), :method => :delete, :data => { :confirm => "Are you sure you want to delete this <%= singular_name.humanize.downcase %>?" }) %>
 			</td>
 		</tr>
 	<%% end %>

metadata CHANGED

@@ -1,84 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: casein
-version: !ruby/object:Gem::Version
-  hash: 21
-  prerelease:
-  segments:
-  - 3
-  - 1
-  - 11
-  version: 3.1.11
+version: !ruby/object:Gem::Version
+  version: 4.0.0.beta1
 platform: ruby
-authors:
+authors:
 - Russell Quinn
-- Spoiled Milk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00 -07:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2013-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.4
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-  name: casein
-  version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+- !ruby/object:Gem::Dependency
+  name: authlogic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        hash: 7
-        segments:
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  name: will_paginate
-  version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        hash: 1
-        segments:
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  name: authlogic
-  version_requirements: *id003
   prerelease: false
-description: Casein is an open-source CMS for Ruby on Rails, originally developed by Spoiled Milk.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Casein is an open-source CMS for Ruby on Rails.
 email: mail@russellquinn.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - README.rdoc
-files:
+files:
 - Gemfile
 - MIT-LICENSE
 - PUBLIC_VERSION.yml
 - README.rdoc
 - Rakefile
+- app/assets/images/casein/casein.png
+- app/assets/images/casein/header.png
+- app/assets/images/casein/icons/add.png
+- app/assets/images/casein/icons/delete.png
+- app/assets/images/casein/icons/table.png
+- app/assets/images/casein/login/alertBg.png
+- app/assets/images/casein/login/background.png
+- app/assets/images/casein/login/bottom.png
+- app/assets/images/casein/login/loginBoxBg.png
+- app/assets/images/casein/login/loginBoxBottom.png
+- app/assets/images/casein/login/loginBoxTop.png
+- app/assets/images/casein/login/loginSubmit.png
+- app/assets/images/casein/login/recoverSubmit.png
+- app/assets/images/casein/login/top.png
+- app/assets/images/casein/nav.png
+- app/assets/images/casein/rightNav.png
+- app/assets/images/casein/rightNavButton.png
+- app/assets/images/casein/visitSiteNav.png
+- app/assets/javascripts/casein/casein.js
+- app/assets/javascripts/casein/login.js
+- app/assets/stylesheets/casein/casein.css.scss
+- app/assets/stylesheets/casein/elements.css.scss
+- app/assets/stylesheets/casein/login.css.scss
+- app/assets/stylesheets/casein/screen.css.scss
 - app/controllers/casein/casein_controller.rb
 - app/controllers/casein/password_resets_controller.rb
 - app/controllers/casein/user_sessions_controller.rb
@@ -103,12 +112,12 @@ files:
 - lib/casein/engine.rb
 - lib/generators/casein/install/USAGE
 - lib/generators/casein/install/install_generator.rb
+- lib/generators/casein/install/templates/app/assets/javascripts/casein/custom.js
+- lib/generators/casein/install/templates/app/assets/stylesheets/casein/custom.css.scss
 - lib/generators/casein/install/templates/app/helpers/casein/config_helper.rb
 - lib/generators/casein/install/templates/app/views/casein/layouts/_left_navigation.html.erb
 - lib/generators/casein/install/templates/app/views/casein/layouts/_right_navigation.html.erb
 - lib/generators/casein/install/templates/db/migrate/casein_create_users.rb
-- lib/generators/casein/install/templates/public/casein/javascripts/custom.js
-- lib/generators/casein/install/templates/public/casein/stylesheets/custom.css
 - lib/generators/casein/install/templates/public/robots.txt
 - lib/generators/casein/scaffold/USAGE
 - lib/generators/casein/scaffold/scaffold_generator.rb
@@ -120,67 +129,28 @@ files:
 - lib/generators/casein/scaffold/templates/views/index.html.erb
 - lib/generators/casein/scaffold/templates/views/new.html.erb
 - lib/generators/casein/scaffold/templates/views/show.html.erb
-- lib/generators/casein/update/USAGE
-- lib/generators/casein/update/templates/public/casein/images/casein.png
-- lib/generators/casein/update/templates/public/casein/images/header.png
-- lib/generators/casein/update/templates/public/casein/images/icons/add.png
-- lib/generators/casein/update/templates/public/casein/images/icons/delete.png
-- lib/generators/casein/update/templates/public/casein/images/icons/table.png
-- lib/generators/casein/update/templates/public/casein/images/login/alertBg.png
-- lib/generators/casein/update/templates/public/casein/images/login/background.png
-- lib/generators/casein/update/templates/public/casein/images/login/bottom.png
-- lib/generators/casein/update/templates/public/casein/images/login/loginBoxBg.png
-- lib/generators/casein/update/templates/public/casein/images/login/loginBoxBottom.png
-- lib/generators/casein/update/templates/public/casein/images/login/loginBoxTop.png
-- lib/generators/casein/update/templates/public/casein/images/login/loginSubmit.png
-- lib/generators/casein/update/templates/public/casein/images/login/recoverSubmit.png
-- lib/generators/casein/update/templates/public/casein/images/login/top.png
-- lib/generators/casein/update/templates/public/casein/images/nav.png
-- lib/generators/casein/update/templates/public/casein/images/rightNav.png
-- lib/generators/casein/update/templates/public/casein/images/rightNavButton.png
-- lib/generators/casein/update/templates/public/casein/images/visitSiteNav.png
-- lib/generators/casein/update/templates/public/casein/javascripts/casein.js
-- lib/generators/casein/update/templates/public/casein/javascripts/jquery.js
-- lib/generators/casein/update/templates/public/casein/javascripts/login.js
-- lib/generators/casein/update/templates/public/casein/javascripts/rails.js
-- lib/generators/casein/update/templates/public/casein/stylesheets/elements.css
-- lib/generators/casein/update/templates/public/casein/stylesheets/login.css
-- lib/generators/casein/update/templates/public/casein/stylesheets/screen.css
-- lib/generators/casein/update/update_generator.rb
 - lib/railties/tasks.rake
-has_rdoc: true
-homepage: http://github.com/spoiledmilk/casein3
+homepage: http://github.com/russellquinn/casein
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 1.5.3
+rubygems_version: 2.0.5
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A lightweight Ruby on Rails CMS.
 test_files: []