mappable 0.0.5 → 0.0.6

data/README.md

@@ -46,6 +46,10 @@ You can use the included generator to copy the views if you'd like to customize
 
     rails generate mappable:views
 
+If you want to override the views for `mappings` that belong to a specific `map` puts them in `app/views/mappable/[MAP_NAME]/mappings`. You can also generate these scoped views:
+
+    rails generate mappable:views account_names
+
 Definitions
 
  * **Mappings**: String pairs that map to each other
@@ -84,6 +88,5 @@ Now you can map strings in either direction using the following grammar
 
 Move rebuilding of maps to an initializer and/or add notes to readme about why Map.all gets called on every request in development
 Better indexing in migrations
-Rake task for installing views
 Add security features
 Deal with going from/to when there's more than one to with the same name

data/app/controllers/mappable/mappings_controller.rb

@@ -1,6 +1,7 @@
 module Mappable
   class MappingsController < ::ApplicationController
-    before_filter :load_map!, only: [:index, :new]
+    before_filter :load_map_attributes
+    before_filter :load_map, only: [:index, :new]
 
     def index
       @mappings = @map.mappings
@@ -47,8 +48,28 @@ module Mappable
 
     private
 
-    def load_map!
-      @map = Map.find_by_subject_and_attr!(params[:subject], params[:attr].try(:singularize))
-    end
+      def load_map
+        @map = Map.find_by_subject_and_attr!(params[:subject], params[:attr].singularize)
+      end
+
+      def load_map_attributes
+        @subject = params[:subject]
+        @attr = params[:attr].singularize
+      end
+
+      def render(*args, &block)
+        options = _normalize_render(*args, &block)
+        options[:prefixes].unshift map_specific_view_path
+        self.response_body = render_to_body(options)
+      end
+
+      def map_specific_view_path
+        "mappable/#{@subject}_#{@attr.pluralize}/#{engine_controller}"
+      end
+
+      def engine_controller
+        params[:controller].split("/").last
+      end
+
   end
 end

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

@@ -12,16 +12,20 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :from %><br />
+    <%= f.label :from, "#{@mapping.map.from.humanize} #{@mapping.map.subject.humanize.downcase} #{@mapping.map.attr.humanize.downcase}" %><br />
     <%= f.text_field :from %>
   </div>
+
   <div class="field">
-    <%= f.label :to %><br />
+    <%= f.label :to, "#{@mapping.map.to.humanize} #{@mapping.map.subject.humanize.downcase} #{@mapping.map.attr.humanize.downcase}" %><br />
     <%= f.text_field :to %>
   </div>
+
   <%= f.hidden_field :map_id %>
+
   <div class="actions">
     <% label = @mapping.new_record? ? "Create Mapping" : "Update Mapping" %>
     <%= f.submit label  %>
   </div>
+
 <% end %>

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

@@ -1,4 +1,4 @@
-<h1><%= @map.subject.humanize %> <%= @map.attr.humanize.downcase %> mappings</h1>
+<h1><%= "#{@map.subject.humanize} #{@map.attr.humanize.downcase} mappings" %></h1>
 
 <table>
   <tr>

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

@@ -1,4 +1,4 @@
-<h1>New mapping</h1>
+<h1><%= "New #{@mapping.parent_map.subject.humanize.titleize} #{@mapping.parent_map.attr.humanize.titleize} Mapping" %></h1>
 
 <%= render 'form' %>
 

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

@@ -1,17 +1,14 @@
-<h1>Edit <%= @mapping.map.subject.humanize.titleize %> <%= @mapping.map.attr.humanize.titleize %> Mappings</h1>
+<h1><%= "#{@mapping.parent_map.subject.humanize.titleize} #{@mapping.parent_map.attr.humanize.titleize} Mapping" %></h1>
 
 <p>
-  <b>Map:</b>
-  <%= @mapping.parent_map.subject %>
-</p>
-
-<p>
-  <b>From:</b>
+  <b><%= "#{@mapping.map.from.humanize} #{@mapping.parent_map.subject.humanize.downcase} #{@mapping.parent_map.attr.humanize.downcase}" %>:</b>
+  <br />
   <%= @mapping.from %>
 </p>
 
 <p>
-  <b>To:</b>
+  <b><%= "#{@mapping.map.to.humanize} #{@mapping.parent_map.subject.humanize.downcase} #{@mapping.parent_map.attr.humanize.downcase}" %>:</b>
+  <br />
   <%= @mapping.to %>
 </p>
 

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

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

@@ -1,4 +1,4 @@
-<h1><%= @map.subject.humanize.titleize %> <%= @map.attr.humanize.titleize %> Mappings</h1>
+<h1><%= "#{@map.subject.humanize.titleize} #{@map.attr.humanize.titleize} Mappings" %></h1>
 
 <h2>Maps <em><%= @map.from %></em> to <em><%= @map.to %></em></h2>
 

data/lib/generators/mappable/views/USAGE

@@ -18,3 +18,15 @@ Example:
         app/views/mappable/maps/index.html.erb
         app/views/mappable/maps/new.html.erb
         app/views/mappable/maps/show.html.erb
+
+    rails generate mappable:views account_names
+
+    This will create:
+        app/views/mappable
+        app/views/mappable/account_names
+        app/views/mappable/account_names/mappings
+        app/views/mappable/account_names/mappings/_form.html.erb
+        app/views/mappable/account_names/mappings/edit.html.erb
+        app/views/mappable/account_names/mappings/index.html.erb
+        app/views/mappable/account_names/mappings/new.html.erb
+        app/views/mappable/account_names/mappings/show.html.erb

data/lib/generators/mappable/views/views_generator.rb

@@ -1,20 +1,39 @@
 module Mappable
   class ViewsGenerator < Rails::Generators::NamedBase
     source_root File.expand_path('../../../../../app/views/mappable', __FILE__)
-    argument :name, :type => :string, :default => 'views'
+    argument :name, :type => :string, :default => ''
 
     def copy_view_files
-      empty_directory "app/views/mappable/maps"
-      copy_file "maps/_form.html.erb", "app/views/mappable/maps/_form.html.erb"
-      copy_file "maps/edit.html.erb", "app/views/mappable/maps/edit.html.erb"
-      copy_file "maps/index.html.erb", "app/views/mappable/maps/index.html.erb"
-      copy_file "maps/new.html.erb", "app/views/mappable/maps/new.html.erb"
-      copy_file "maps/show.html.erb", "app/views/mappable/maps/show.html.erb"
-      empty_directory "app/views/mappable/mappings"
-      copy_file "mappings/edit.html.erb", "app/views/mappable/mappings/edit.html.erb"
-      copy_file "mappings/index.html.erb", "app/views/mappable/mappings/index.html.erb"
-      copy_file "mappings/new.html.erb", "app/views/mappable/mappings/new.html.erb"
-      copy_file "mappings/show.html.erb", "app/views/mappable/mappings/show.html.erb"
+
+      map_files = %w[
+        maps/_form
+        maps/edit
+        maps/index
+        maps/new
+        maps/show
+      ]
+
+      mapping_files = %w[
+        mappings/_form
+        mappings/edit
+        mappings/index
+        mappings/new
+        mappings/show
+      ]
+
+      files = mapping_files
+      files += map_files if name.blank?
+
+      files.each do |file|
+        from_path = "#{file}.html.erb"
+
+        path_parts = ["mappable"]
+        path_parts.push(name) unless name.blank? # include the name as namespace if not blank
+        path_parts.push("#{file}.html.erb")
+
+        to_path = File.join('app/views', *path_parts)
+        copy_file from_path, to_path
+      end
     end
   end
 end

data/lib/mappable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mappable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70188236597900 !ruby/object:Gem::Requirement
+  requirement: &70243809829940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70188236597900
+  version_requirements: *70243809829940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70188236597360 !ruby/object:Gem::Requirement
+  requirement: &70243809828860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70188236597360
+  version_requirements: *70243809828860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70188236596900 !ruby/object:Gem::Requirement
+  requirement: &70243809827540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70188236596900
+  version_requirements: *70243809827540
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70188236596420 !ruby/object:Gem::Requirement
+  requirement: &70243809825660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *70188236596420
+  version_requirements: *70243809825660
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70188236595940 !ruby/object:Gem::Requirement
+  requirement: &70243809824800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70188236595940
+  version_requirements: *70243809824800
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70188236595480 !ruby/object:Gem::Requirement
+  requirement: &70243809741320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,40 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *70188236595480
+  version_requirements: *70243809741320
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70243809739840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :development
+  prerelease: false
+  version_requirements: *70243809739840
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70243809739020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: *70243809739020
+- !ruby/object:Gem::Dependency
+  name: genspec
+  requirement: &70243809737840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :development
+  prerelease: false
+  version_requirements: *70243809737840
 description: Lightweight string mappings engine for Rails
 email:
 - mikebannister@gmail.com
@@ -91,7 +124,6 @@ files:
 - app/assets/stylesheets/mappable/mappings.css
 - app/assets/stylesheets/mappable/maps.css
 - app/assets/stylesheets/scaffold.css
-- app/controllers/mappable/application_controller.rb
 - app/controllers/mappable/mappings_controller.rb
 - app/controllers/mappable/maps_controller.rb
 - app/helpers/mappable/application_helper.rb
@@ -137,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2016495543354355232
+      hash: -1921446453130166665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2016495543354355232
+      hash: -1921446453130166665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/controllers/mappable/application_controller.rb

@@ -1,4 +0,0 @@
-module Mappable
-  class ApplicationController < ActionController::Base
-  end
-end