cmsable 0.4.1 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQxZWViNjU4MjJiMzBiMGE1NzU1YzYwOTQxMWY3YWY0YmIyYTk1OQ==
+    YTdkODZlM2IyMDM2MjYyODk4YzExYmM3MWU1MDVjNTdlMTEwZTg1Yg==
   data.tar.gz: !binary |-
-    ZWMwY2RhM2U5MzdjNTQ3NGY4NjEwYjNhNTM0MGI3YWYzN2Y0YzQ1YQ==
+    M2IwYjI0MDA3YWEzN2MwNWZiN2UzZTFiZTI3ZjNkYWYyYjdiMDUxMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDk1MjM2MDFkZDI5MjhhYmU4OGZlYjZkNWJjNDQwZTNhZWIzMTUzYzFiMmY1
-    MjdiYzE4OTQ5ZmI2MDhmNmI3OGQwMTBhZjZkOWNmMmRiZDQ5OTU4ZGM1OGVh
-    YjUyNmIwZjZmNmQyMzhkNjQxZmZjYTJlMDQ0ZTBjZjNlNWMxODQ=
+    ZDdjYWIwYWZmZTNkZjJkOWQ5NmNjM2Y1NmY0MjVkZTIyZDcxZWNmNWJhNWFl
+    OWUwNTcyMDI3NjM5MzgxNjY5YjJlZDg1ODE2MDZhNjk2ZjdiM2JkNWY4ODZm
+    YzM0ZjgyYTlmMDczZmU5MDM4NDNlNmZhNDI1YWMzMjgyZGFmM2I=
   data.tar.gz: !binary |-
-    YTE1YzE4Mzc1MmZiYzk0MTBhODgyOGNiNTVkZTVmOTkxODFlMzU2NTc4ZmU1
-    ZTFlNzcxNDBiZjk0YTJmMWQwMDIxOThlNDkwMzUzM2FhMTY0ZWVjNWQ5YWFk
-    MTBjOTk3ZTg5ZWUwMjJlNTg4YzM0N2NlYTgxNjQyYjdlNjVkMjA=
+    Y2ZhMTM3OTZiZjUzYWIwM2ZlMzdhNzMyZmY0MTVmNTkxMjQ3Y2RmNTY0ZTI1
+    NjEzZmNkZDY1MTcwMjAzODk2OWJhN2JmYTg1N2RjYmFjN2MyZTczMzQyM2Jk
+    ODkxZGIzZTU2OTU4OGI0Y2VjOWRjYTY0ZmJlNzBkYjdmYmE4MTY=

data/README.md

@@ -42,27 +42,21 @@ end
 
 ## Usage
 
-Add to your layout:
-
-```ruby
-<%= cmsable_assets %>
-```
-
 ### To use the built in model
 In your view files
 
 ```ruby
-<%= cmsable 'identifier' %>
+<%= cms 'identifier' %>
 ```
 
 Identifier can be any string or symbol, for example `'Homepage Intro'` or `:something`
 
-For plain text areas pass `plain: true` as an option.
+For plain text areas pass `type: :plain` as an option.
 This way you can put content in any tag you want without worrying about users
 messing up the markup.
 
 ```ruby
-<span><%= cmsable :identifier, plain: true %></span>
+<span><%= cms :identifier, type: :plain %></span>
 ```
 
 The problem with the above is that in edit mode you'll end up with invalid HTML:
@@ -74,7 +68,7 @@ The problem with the above is that in edit mode you'll end up with invalid HTML:
 To avoid this you can override the tag used in edit mode:
 
 ```ruby
-<%= cmsable :identifier, plain: true, tag: 'span' %>
+<%= cms :identifier, type: :plain, tag: 'span' %>
 ```
 Resulting in:
 ```html
@@ -85,22 +79,23 @@ Resulting in:
 Add to your model:
 
 ```ruby
-cmsable :body => :column_to_use_for_content
+cms :body => :column_to_use_for_content
 ```
 
 Then in your views:
 ```ruby
-<%= cmsable @model_instance %>
+<%= cms @model_instance %>
 ```
 
 ## TODO
+  - Allow classes on custom tags
+  - Fix highlight so empty areas are still visible
+  - Add image mode
+  - Add file mode
+  - Add video mode (youtube/vimeo/etc)
+  - Add support for langs/i18n
   - Handle saving errors
-  - Remove CanCan dependancy
   - Decouple ckeditor
   - Support different editors
+  - Remove CanCan dependancy
   - Setup config initializer for added customizability
-  - Add file mode
-  - Add image mode
-  - Add video mode (youtube/vimeo/etc)
-  - Add support for langs/i18n
-  - Fix highlight so empty areas are still visible

data/app/controllers/cmsable/cmsable_controller.rb

@@ -3,10 +3,13 @@ module Cmsable
     def update
       model = params[:model].constantize
 
-      render :text => false and return if cannot? :update, model
+      render text: false and return if cannot? :update, model
 
+      record = model.find(params[:id])
+      body = params.require(:content).permit(:body)[:body]
       attribute = model.cmsable_body
-      render :text => model.find(params[:id]).update_attribute(attribute, params[:content][:body])
+
+      render text: record.update(attribute => body)
     end
   end
 end

data/app/helpers/cmsable/cmsable_helper.rb

@@ -19,7 +19,7 @@ module Cmsable
       tag: nil # What tag to use for contenteditable
     }
 
-    def cmsable(name_or_model, options = {})
+    def cms(name_or_model, options = {})
       model = get_model name_or_model
 
       options = DEFAULTS.merge options

data/app/models/cmsable/content.rb

@@ -3,9 +3,6 @@ module Cmsable
     # Extensions
     cmsable
 
-    # Attribute accessibility
-    attr_accessible :body, :name
-
     # Validations
     validates :name, :presence => true
 
@@ -21,7 +18,10 @@ module Cmsable
     end
 
     def self.get name
-      find_or_create_by_name name, :body => I18n.t("cmsable.#{name}", default: "<p>Awaiting Content</p>")
+      find_or_create_by name: name do |record|
+        body = I18n.t("cmsable.#{name}", default: "<p>Awaiting Content</p><script>alert('Cmsable entry \"#{name}\" is awaiting content');</script>")
+        record.update body: body
+      end
     end
 
     # Scopes

data/app/views/cmsable/cmsable/control.html.erb

@@ -1,3 +1,4 @@
+<%= cmsable_assets %>
 <div id="cmsable_control">
   <a class="cmsable_edit">Edit Mode</a>
   <a class="cmsable_save" data-token="<%= form_authenticity_token %>">Save Changes</a>

data/config/routes.rb

@@ -1,4 +1,3 @@
 Cmsable::Engine.routes.draw do
-  get '/:action', :to => 'cmsable'
   put '/:id', :to => 'cmsable#update'
 end

data/lib/cmsable/engine.rb

@@ -4,8 +4,8 @@ module Cmsable
   class Engine < ::Rails::Engine
     isolate_namespace Cmsable
     initializer 'cmsable.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        helper Cmsable::CmsableHelper
+      ActiveSupport.on_load :action_view do
+        include Cmsable::CmsableHelper
       end
     end
   end

data/lib/cmsable/version.rb

@@ -1,3 +1,3 @@
 module Cmsable
-  VERSION = '0.4.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmsable
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Nick Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,6 @@ files:
 - app/assets/stylesheets/cmsable/application.css
 - app/assets/stylesheets/cmsable/cmsable.css
 - app/controllers/cmsable/cmsable_controller.rb
-- app/helpers/cmsable/application_helper.rb
 - app/helpers/cmsable/cmsable_helper.rb
 - app/models/cmsable/content.rb
 - app/views/cmsable/cmsable/control.html.erb

data/app/helpers/cmsable/application_helper.rb

@@ -1,4 +0,0 @@
-module Cmsable
-  module ApplicationHelper
-  end
-end