mappable 0.0.4 → 0.0.5

data/app/views/mappable/mappings/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@mapping, url: mappings_path(subject: @mapping.parent_map.subject, attr: @mapping.parent_map.attr.pluralize)) do |f| %>
+<%= form_for(@mapping) do |f| %>
   <% if @mapping.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@mapping.errors.count, "error") %> prohibited this mapping from being saved:</h2>
@@ -21,6 +21,7 @@
   </div>
   <%= f.hidden_field :map_id %>
   <div class="actions">
-    <%= f.submit %>
+    <% label = @mapping.new_record? ? "Create Mapping" : "Update Mapping" %>
+    <%= f.submit label  %>
   </div>
 <% end %>

data/app/views/mappable/mappings/index.html.erb

@@ -14,10 +14,8 @@
     <td><%= mapping.from %></td>
     <td><%= mapping.to %></td>
     <td><%= link_to 'Show', mapping_path(mapping, subject: @map.subject, attr: @map.attr.pluralize) %></td>
-    <td><%= link_to 'Edit', edit_mapping_path(mapping) %></td>
-    <td><%= link_to 'Destroy', mapping_path(mapping, subject: @map.subject, attr: @map.attr.pluralize), confirm: 'Are you sure?', method: :delete %></td>
-  </tr>
-<% end %>
+    <td><%= link_to 'Edit', edit_mapping_path(mapping, subject: @map.subject, attr: @map.attr.pluralize) %></td>
+    <td><%= link_to 'Destroy', mapping_path(mapping, subject: @map.subject, attr: @map.attr.pluralize), confirm: 'Are you sure?', method: :delete %></td><% end %>
 </table>
 
 <br />

data/app/views/mappable/mappings/show.html.erb

@@ -1,4 +1,4 @@
-<h1>Edit <%= @map.subject.humanize.titleize %> <%= @map.attr.humanize.titleize %> Mappings</h1>
+<h1>Edit <%= @mapping.map.subject.humanize.titleize %> <%= @mapping.map.attr.humanize.titleize %> Mappings</h1>
 
 <p>
   <b>Map:</b>

data/app/views/mappable/maps/index.html.erb

@@ -17,7 +17,7 @@
     <td><%= map.attr %></td>
     <td><%= map.from %></td>
     <td><%= map.to %></td>
-    <td><%= link_to 'Show', map %></td>
+    <td><%= link_to 'Show', mappings_path(subject: map.subject, attr: map.attr.pluralize) %></td>
     <td><%= link_to 'Edit', edit_map_path(map) %></td>
     <td><%= link_to 'Destroy', map, confirm: 'Are you sure?', method: :delete %></td>
   </tr>

data/config/routes.rb

@@ -21,5 +21,18 @@ Mappable::Engine.routes.draw do
         as: 'mapping',
         via: 'get'
 
-  resources :mappings, only: [:edit, :destroy]
+  match "/:subject/:attr/:id/edit",
+        to: 'mappings#edit',
+        as: 'edit_mapping',
+        via: 'get'
+
+  match "/:subject/:attr/:id",
+        to: 'mappings#update',
+        as: 'mapping',
+        via: 'put'
+
+  match "/:subject/:attr/:id",
+        to: 'mappings#destroy',
+        as: 'mapping',
+        via: 'delete'
 end

data/lib/mappable/version.rb

@@ -1,3 +1,3 @@
 module Mappable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mappable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70211475888860 !ruby/object:Gem::Requirement
+  requirement: &70188236597900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70211475888860
+  version_requirements: *70188236597900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70211475888280 !ruby/object:Gem::Requirement
+  requirement: &70188236597360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70211475888280
+  version_requirements: *70188236597360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70211475887740 !ruby/object:Gem::Requirement
+  requirement: &70188236596900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70211475887740
+  version_requirements: *70188236596900
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70211475887280 !ruby/object:Gem::Requirement
+  requirement: &70188236596420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *70211475887280
+  version_requirements: *70188236596420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70211475886720 !ruby/object:Gem::Requirement
+  requirement: &70188236595940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70211475886720
+  version_requirements: *70188236595940
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70211475886260 !ruby/object:Gem::Requirement
+  requirement: &70188236595480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *70211475886260
+  version_requirements: *70188236595480
 description: Lightweight string mappings engine for Rails
 email:
 - mikebannister@gmail.com
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -719282748366311490
+      hash: -2016495543354355232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -719282748366311490
+      hash: -2016495543354355232
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10