x-editable-rails 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658565005fa676f034fc99c545ba7e60158b983b
-  data.tar.gz: 67c484363471f28a725164ffbdbb8476ac9268d2
+  metadata.gz: f211902f307559fafdeb55542265063b6aed1b74
+  data.tar.gz: b01c23c18a006cd2079bf562621df7774830942c
 SHA512:
-  metadata.gz: fb098d43de97de7c8a9b71495a79f8d7ace85d76792f0476a55381da194491e25d74bf6ae4236de79948b15ca65aa907616bb3fa00e23b38416947ccb3ca1a73
-  data.tar.gz: f40ec85577f7b1d4cb6ce0d36123918a1b77c4e4f7a56d1394bbb5d17a7356e028bf377da90513cd40e5768425c83d9a47876ae9426b358f443b38352622fa1f
+  metadata.gz: 9fe4a918b0d2e3da58d6105c8646f757780855011bd347c814d3b7b073abb6d6e40b77d52dc7dde206fb7d3d61b1d792b28ddc9521605ceeac297c4e8fd90842
+  data.tar.gz: da69e8902b82d4f9fe578e02a9bb2f2e8b17598a346168b198cd2dc57f8cac572406bdf90436a6f15290c490bbd9f2b547943fc35000b46f661fa2aa8d4c21fa

data/README.md

@@ -84,12 +84,16 @@ A `span` element is rendered with `data-*` attributes used by `x-editable`.
 %h1= editable @model, :name
 ```
 
-The helper method automatically adds these `data-*` attributes used by [x-editable](http://vitalets.github.io/x-editable/docs.html).
+You can customize the tag name and title attribute:
+
+* **tag** - `span` by default.
+* **title** - The model and attribute name are used to create a capitalized title
+
+The `editable` helper method automatically adds these `data-*` attributes used by [x-editable](http://vitalets.github.io/x-editable/docs.html).
 
 * **url** - Uses the `polymorphic_path(model)` helper method.
 * **source** - Only populated if the value is a boolean to convert `true` or `false` to "Yes" and "No".
 * **value** - Uses `model.name`. If `model.name` were a boolean value or if a `source` is specified, the `source` text would be displayed rather than the raw value. (Presumably the value is an ID and the source would have the text associated with that value.)
-* **title** - The model and attribute name are used to create a capitalized title
 * **placeholder** - Uses the `title` value by default
 
 ```ruby
@@ -157,7 +161,7 @@ This example uses the `MailingList` class and its attributes.
 The attribute value can be a string, which is used as the `title` and `placeholder`. 
 If you want to specify other options, create a hash of options.
 
-Save your YAML file in: `config/x-editable.yml`. Here is an example [example](config/x-editable.yml).
+Install configuration file like this: `rails g x_editable_rails:install`, this step is not necessary 
 
 ```yaml
 class_options:
@@ -192,6 +196,18 @@ editable model, :name    # type: "text",   title: "Mailing list name"
 editable model, :enabled # type: "select", title: "Enabled", source: [ "Active", "Disabled" ]
 ```
 
+### Examples
+
+Gem also contains demo application with integrated x-editable
+
+```
+cd test/dummy
+rake db:migrate
+rake db:seed
+rails g x_editable_rails:install # optional, it generate config example
+rails s
+```
+
 ## Contributing
 
 1. Fork it

data/lib/generators/x_editable_rails/install_generator.rb

@@ -0,0 +1,12 @@
+module XEditableRails
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc 'Copy example of x-editable config'
+      def copy_x_editable_yml
+        template 'x-editable.yml', 'config/x-editable.yml'
+      end   
+    end
+  end
+end

data/lib/generators/x_editable_rails/templates/x-editable.yml

@@ -0,0 +1,19 @@
+# More informations you can find here: https://github.com/werein/x-editable-rails
+class_options:
+  MailingList:
+    name: Mailing list name
+    enabled:
+      type: select
+      source:
+        - Active
+        - Disabled
+    reply_email:
+      type: email
+      title: Reply-to email
+  User:
+    email:
+      type: email
+    password:
+      type: password
+    mailing_lists:
+      type: select

data/lib/x-editable-rails/configuration.rb

@@ -17,20 +17,14 @@ module X
         end
         
         def options
-          default_options.deep_merge custom_options
-        end
-        
-        def default_options
-          @defaults ||= begin
-            options = load_yaml_file File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "x-editable.yml"))
-            format_class_options! options
-          end
-        end
-        
-        def custom_options
-          @custom_options ||= begin
-            options = load_yaml_file ::Rails.root.join("config", "x-editable.yml")
-            format_class_options! options
+          config_fn = ::Rails.root.join("config", "x-editable.yml")
+          if File.file?(config_fn)
+            @options ||= begin
+              options = load_yaml_file config_fn
+              format_class_options! options
+            end
+          else
+            @options = {}
           end
         end
         

data/lib/x-editable-rails/version.rb

@@ -1,7 +1,7 @@
 module X
   module Editable
     module Rails
-      VERSION = "1.5.0"
+      VERSION = "1.5.1"
     end
   end
 end

data/vendor/assets/javascripts/editable/rails/editable_form.js.coffee

@@ -1,40 +1,55 @@
 jQuery ($) ->
   EditableForm = $.fn.editableform.Constructor
   EditableForm.prototype.saveWithUrlHook = (value) ->
-    originalUrl = @options.url
-    model = @options.model
-    nestedName = @options.nested
-    nestedId =  @options.nid
-    nestedLocale = @options.locale
+    originalUrl   = @options.url
+    model         = @options.model
+    nestedName    = @options.nested
+    nestedId      = @options.nid
+    nestedLocale  = @options.locale
+    
     @options.url = (params) =>
       if typeof originalUrl == 'function'
         originalUrl.call(@options.scope, params)
       else if originalUrl? && @options.send != 'never'
         myName = params.name
+        
         if typeof params.value == 'string'
           myValue = params.value.replace(/(\r\n|\n|\r)/gm,"<br/>")
         else
           myValue = params.value
+        
+        # if there are no values in a list, add a blank value so Rails knows all values were removed
+        if Object.prototype.toString.call(params.value) == '[object Array]' && params.value.length == 0
+          params.value.push("")
+        
         obj = {}
+        
         if nestedName
-          nested = {}
-          nested[myName] = myValue
-          nested['id'] = nestedId
+          nested          = {}
+          nested[myName]  = myValue
+          nested['id']    = nestedId
+          
           if nestedLocale
             nested['locale'] = nestedLocale
+          
           obj[nestedName + '_attributes'] = nested
         else
           obj[myName] = myValue
+          
         params[model] = obj
+        
         delete params.name
         delete params.value
         delete params.pk
+        
         $.ajax($.extend({
-          url     : originalUrl
-          data    : params
-          type    : 'PUT'
+          url:      originalUrl
+          data:     params
+          type:     'PUT'
           dataType: 'json'
         }, @options.ajaxOptions))
+    
     @saveWithoutUrlHook(value)
+    
   EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
   EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: x-editable-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jiri Kolarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,27 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '4.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,6 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/generators/x_editable_rails/install_generator.rb
+- lib/generators/x_editable_rails/templates/x-editable.yml
 - lib/x-editable-rails/configuration.rb
 - lib/x-editable-rails/version.rb
 - lib/x-editable-rails/view_helpers.rb
@@ -110,6 +112,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -127,4 +130,3 @@ signing_key:
 specification_version: 4
 summary: X-editable for Rails
 test_files: []
-has_rdoc: