viewable 0.5.7 → 0.5.8

data/lib/viewable/generators/viewable/templates/models/viewing.rb

@@ -1,4 +1,4 @@
-require_relative './concerns/viewable'
-class Viewing < ActiveRecord::Base
-	include Viewable
-end
+require_relative './concerns/viewable'
+class Viewing < ActiveRecord::Base
+	include Viewable
+end

data/lib/viewable/generators/viewable/templates/views/_errors.html.erb

@@ -1,13 +1,13 @@
-  <%% if @<%=viewable_views_name.singularize%>.errors.any? %>
-  <div class="errors">
-    <h3>
-      <%%= pluralize(@<%=viewable_views_name.singularize%>.errors.count, 'error') %>
-      prohibited this <%=viewable_views_name.singularize%> from being saved:
-    </h3>
-    <ul>
-      <%% @<%=viewable_views_name.singularize%>.errors.full_messages.each do |message| %>
-        <li><%%= message %></li>
-      <%% end %>
-    </ul>
-  </div>
-<%% end %>
+  <%% if @<%=viewable_views_name.singularize%>.errors.any? %>
+  <div class="errors">
+    <h3>
+      <%%= pluralize(@<%=viewable_views_name.singularize%>.errors.count, 'error') %>
+      prohibited this <%=viewable_views_name.singularize%> from being saved:
+    </h3>
+    <ul>
+      <%% @<%=viewable_views_name.singularize%>.errors.full_messages.each do |message| %>
+        <li><%%= message %></li>
+      <%% end %>
+    </ul>
+  </div>
+<%% end %>

data/lib/viewable/generators/viewable/templates/views/_form.html.erb

@@ -1,6 +1,6 @@
-<%%= form_for @<%=viewable_views_name.singularize%> do |f| %>
-  <%%= render 'errors' %>
-  <%%= f.label 'name', 'Name' %>
-  <%%= f.text_field 'name', placeholder: 'Name'%>
-  <%%= f.submit 'Submit' %>
-<%% end %>
+<%%= form_for @<%=viewable_views_name.singularize%> do |f| %>
+  <%%= render 'errors' %>
+  <%%= f.label 'name', 'Name' %>
+  <%%= f.text_field 'name', placeholder: 'Name'%>
+  <%%= f.submit 'Submit' %>
+<%% end %>

data/lib/viewable/generators/viewable/templates/views/edit.html.erb

@@ -1 +1 @@
-<%%= render 'form' %>
+<%%= render 'form' %>

data/lib/viewable/generators/viewable/templates/views/index.html.erb

@@ -1,11 +1,12 @@
-<h3><%=viewable_views_name.pluralize.gsub(/(_)/,' ')%></h3>
-
-<%% @<%=viewable_views_name.pluralize%>.each do |<%=viewable_views_name.singularize%>| %>
-  <div class="<%=viewable_views_name.singularize%>">
-    <%%= <%=viewable_views_name.singularize%>.name %>
-    <%%= link_to "Show all viewing", <%=viewable_views_name.singularize%>_viewings_path(<%=viewable_views_name.singularize%>) %>
-    <%%= link_to "Delete", <%=viewable_views_name.singularize%>_path(<%=viewable_views_name.singularize%>), data: { confirm: 'Are you sure?' }, method: :delete %>
-    <%%= link_to "Edit", edit_<%=viewable_views_name.singularize%>_path(<%=viewable_views_name.singularize%>) %>
-    <%%= link_to "Add viewing", new_<%=viewable_views_name.singularize%>_viewings_path(<%=viewable_views_name.singularize%>) %>
-  </div>
-<%% end %>
+<h3><%=viewable_views_name.pluralize.gsub(/(_)/,' ')%></h3>
+
+<%% @<%=viewable_views_name.pluralize%>.each do |<%=viewable_views_name.singularize%>| %>
+  <div class="<%=viewable_views_name.singularize%>">
+    <%%= <%=viewable_views_name.singularize%>.name %>
+    <%%= link_to "Show all viewing", <%=viewable_views_name.singularize%>_viewings_path(<%=viewable_views_name.singularize%>) %>
+    <%%= link_to "Delete", <%=viewable_views_name.singularize%>_path(<%=viewable_views_name.singularize%>), data: { confirm: 'Are you sure?' }, method: :delete %>
+    <%%= link_to "Edit", edit_<%=viewable_views_name.singularize%>_path(<%=viewable_views_name.singularize%>) %>
+    <%%= link_to "Add viewing", new_<%=viewable_views_name.singularize%>_viewings_path(<%=viewable_views_name.singularize%>) %>
+  </div>
+<%% end %>
+<%%= link_to "New", new_<%=viewable_views_name.singularize%>_path(<%=viewable_views_name.singularize%>) %>

data/lib/viewable/generators/viewable/templates/views/new.html.erb

@@ -1 +1 @@
-<%%= render 'form' %>
+<%%= render 'form' %>

data/lib/viewable/generators/viewable/templates/views/viewings/_errors.html.erb

@@ -1,12 +1,12 @@
-<%% if @viewing.errors.any? %>
-  <div class="errors">
-    <h3><%%= pluralize(@viewing.errors.count, 'error') %>
-      prohibited this viewing from being saved:
-    </h3>
-    <ul>
-      <%% @viewing.errors.full_messages.each do |message| %>
-        <li><%%= message %></li>
-      <%% end %>
-    </ul>
-  </div>
-<%% end %>
+<%% if @viewing.errors.any? %>
+  <div class="errors">
+    <h3><%%= pluralize(@viewing.errors.count, 'error') %>
+      prohibited this viewing from being saved:
+    </h3>
+    <ul>
+      <%% @viewing.errors.full_messages.each do |message| %>
+        <li><%%= message %></li>
+      <%% end %>
+    </ul>
+  </div>
+<%% end %>

data/lib/viewable/generators/viewable/templates/views/viewings/_form.html.erb

@@ -1,11 +1,11 @@
-<%%= form_for([@<%=viewable_views_name.singularize%>, @viewing]) do |f| %>
-  <p>
-    <%%= f.label 'start_time', 'Start time' %>
-    <%%= f.datetime_select :start_time, { minute_step: 15 } %>
-  </p>
-  <p>
-    <%%= f.label 'length', 'Length of viewing in hours' %>
-    <%%= f.number_field 'length', min: 1 %>
-  </p>
-  <%%= f.submit 'Submit' %>
-<%% end %>
+<%%= form_for([@<%=viewable_views_name.singularize%>, @viewing]) do |f| %>
+  <p>
+    <%%= f.label 'start_time', 'Start time' %>
+    <%%= f.datetime_select :start_time, { minute_step: 15 } %>
+  </p>
+  <p>
+    <%%= f.label 'length', 'Length of viewing in hours' %>
+    <%%= f.number_field 'length', min: 1 %>
+  </p>
+  <%%= f.submit 'Submit' %>
+<%% end %>

data/lib/viewable/generators/viewable/templates/views/viewings/edit.html.erb

@@ -1,9 +1,9 @@
-<h3>Edit viewing for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
-
-<%%= render 'errors' %>
-<%%= render 'form' %>
-
-<div class="calendar_container">
-  <div id="calendar">
-  </div>
-</div>
+<h3>Edit viewing for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
+
+<%%= render 'errors' %>
+<%%= render 'form' %>
+
+<div class="calendar_container">
+  <div id="calendar">
+  </div>
+</div>

data/lib/viewable/generators/viewable/templates/views/viewings/index.html.erb

@@ -1,22 +1,22 @@
-<h3> Viewings for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
-<table class="viewings_table">
-  <tr>
-    <th>Start</th>
-    <th>End</th>
-  </tr>
-
-  <%% @viewings.each do |viewing| %>
-  <tr>
-    <td>
-      <%%= viewing.start_time.strftime('%e %b %Y %H:%M%p') %>
-    </td>
-    <td>
-      <%%= (viewing.calculate_end_time + 60).strftime('%e %b %Y %H:%M%p') %>
-    </td>
-    <td><%%= link_to "Delete", <%=viewable_views_name.singularize%>_viewing_path(@<%=viewable_views_name.singularize%>, viewing), data: { confirm: 'Are you sure?' }, method: :delete %>
-    </td>
-    <td><%%= link_to "Edit", edit_<%=viewable_views_name.singularize%>_viewing_path(@<%=viewable_views_name.singularize%>, viewing) %>
-    </td>
-  </tr>
-  <%% end %>
-</table>
+<h3> Viewings for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
+<table class="viewings_table">
+  <tr>
+    <th>Start</th>
+    <th>End</th>
+  </tr>
+
+  <%% @viewings.each do |viewing| %>
+  <tr>
+    <td>
+      <%%= viewing.start_time.strftime('%e %b %Y %H:%M%p') %>
+    </td>
+    <td>
+      <%%= (viewing.calculate_end_time + 60).strftime('%e %b %Y %H:%M%p') %>
+    </td>
+    <td><%%= link_to "Delete", <%=viewable_views_name.singularize%>_viewing_path(@<%=viewable_views_name.singularize%>, viewing), data: { confirm: 'Are you sure?' }, method: :delete %>
+    </td>
+    <td><%%= link_to "Edit", edit_<%=viewable_views_name.singularize%>_viewing_path(@<%=viewable_views_name.singularize%>, viewing) %>
+    </td>
+  </tr>
+  <%% end %>
+</table>

data/lib/viewable/generators/viewable/templates/views/viewings/new.html.erb

@@ -1,9 +1,9 @@
-<h3>Add viewing for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
-
-<%%= render 'errors' %>
-<%%= render 'form' %>
-
-<div class="calendar_container">
-  <div id="calendar">
-  </div>
-</div>
+<h3>Add viewing for <%%= @<%=viewable_views_name.singularize%>.name %></h3>
+
+<%%= render 'errors' %>
+<%%= render 'form' %>
+
+<div class="calendar_container">
+  <div id="calendar">
+  </div>
+</div>

data/lib/viewable/generators/viewable/templates/views/viewings/show.html.erb

@@ -1,6 +1,6 @@
-<h3>Viewing Confirmation</h3>
-<p>Your viewing is confirmed for
-  <%%= @<%=viewable_views_name.singularize%>.name %>:
-  <%%= @viewing.start_time.strftime('%e %b %Y %H:%M%p') %>
-  until
-  <%%= (@viewing.calculate_end_time + 60).strftime('%e %b %Y %H:%M%p') %>
+<h3>Viewing Confirmation</h3>
+<p>Your viewing is confirmed for
+  <%%= @<%=viewable_views_name.singularize%>.name %>:
+  <%%= @viewing.start_time.strftime('%e %b %Y %H:%M%p') %>
+  until
+  <%%= (@viewing.calculate_end_time + 60).strftime('%e %b %Y %H:%M%p') %>

data/lib/viewable/generators/viewable/viewing_model_generator.rb

@@ -1,25 +1,25 @@
-module Viewable
-	module Generators
-		class ViewingModelGenerator < Rails::Generators::Base
-			source_root File.expand_path('../templates/models', __FILE__)
-			argument :resource_name, :type => :string, :default => "resource"
-			def generate_viewing_model
-				copy_file "viewing.rb", "app/models/viewing.rb"
-				template "viewable.rb", "app/models/concerns/viewable.rb"
-			end
-			def create_viewing_migration
-				generate "migration CreateViewings start_time:datetime end_time:datetime length:integer #{resource_name_underscore.singularize}:belongs_to"
-			end
-			def generate_datetime_initializer
-				copy_file "datetime.rb", "config/initializers/datetime.rb"
-			end
-			private
-			def resource_name_underscore
-				resource_name.underscore
-			end
-			def resource_name_camelize
-				resource_name.camelize
-			end
-		end
-	end
-end
+module Viewable
+	module Generators
+		class ViewingModelGenerator < Rails::Generators::Base
+			source_root File.expand_path('../templates/models', __FILE__)
+			argument :resource_name, :type => :string, :default => "resource"
+			def generate_viewing_model
+				copy_file "viewing.rb", "app/models/viewing.rb"
+				template "viewable.rb", "app/models/concerns/viewable.rb"
+			end
+			def create_viewing_migration
+				generate "migration CreateViewings start_time:datetime end_time:datetime length:integer #{resource_name_underscore.singularize}:belongs_to"
+			end
+			def generate_datetime_initializer
+				copy_file "datetime.rb", "config/initializers/datetime.rb"
+			end
+			private
+			def resource_name_underscore
+				resource_name.underscore
+			end
+			def resource_name_camelize
+				resource_name.camelize
+			end
+		end
+	end
+end

data/lib/viewable/generators/viewable/views_generator.rb

@@ -1,21 +1,21 @@
-module Viewable
-	module Generators
-		class ViewsGenerator < Rails::Generators::Base
-			source_root File.expand_path('../templates/views', __FILE__)
-			argument :viewable_views_name, :type => :string, :default => "resources"
-			def generate_viewable_views
-				template "_errors.html.erb", "app/views/#{viewable_views_name.pluralize}/_errors.html.erb"
-				template "_form.html.erb", "app/views/#{viewable_views_name.pluralize}/_form.html.erb"
-				template "edit.html.erb", "app/views/#{viewable_views_name.pluralize}/edit.html.erb"
-				template "index.html.erb", "app/views/#{viewable_views_name.pluralize}/index.html.erb"
-				template "new.html.erb", "app/views/#{viewable_views_name.pluralize}/new.html.erb"
-				template "viewings/_errors.html.erb", "app/views/viewings/_errors.html.erb"
-				template "viewings/_form.html.erb", "app/views/viewings/_form.html.erb"
-				template "viewings/edit.html.erb", "app/views/viewings/edit.html.erb"
-				template "viewings/index.html.erb", "app/views/viewings/index.html.erb"
-				template "viewings/new.html.erb", "app/views/viewings/new.html.erb"
-				template "viewings/show.html.erb", "app/views/viewings/show.html.erb"
-			end
-		end
-	end
-end
+module Viewable
+	module Generators
+		class ViewsGenerator < Rails::Generators::Base
+			source_root File.expand_path('../templates/views', __FILE__)
+			argument :viewable_views_name, :type => :string, :default => "resources"
+			def generate_viewable_views
+				template "_errors.html.erb", "app/views/#{viewable_views_name.pluralize}/_errors.html.erb"
+				template "_form.html.erb", "app/views/#{viewable_views_name.pluralize}/_form.html.erb"
+				template "edit.html.erb", "app/views/#{viewable_views_name.pluralize}/edit.html.erb"
+				template "index.html.erb", "app/views/#{viewable_views_name.pluralize}/index.html.erb"
+				template "new.html.erb", "app/views/#{viewable_views_name.pluralize}/new.html.erb"
+				template "viewings/_errors.html.erb", "app/views/viewings/_errors.html.erb"
+				template "viewings/_form.html.erb", "app/views/viewings/_form.html.erb"
+				template "viewings/edit.html.erb", "app/views/viewings/edit.html.erb"
+				template "viewings/index.html.erb", "app/views/viewings/index.html.erb"
+				template "viewings/new.html.erb", "app/views/viewings/new.html.erb"
+				template "viewings/show.html.erb", "app/views/viewings/show.html.erb"
+			end
+		end
+	end
+end

data/lib/viewable/railtie.rb

@@ -1,8 +1,8 @@
-require 'rails/railtie'
-module Viewable
-	class Railtie < Rails::Railtie
-		generators do
-			require "generators/viewable/install_generator"
-		end
-	end
-end
+require 'rails/railtie'
+module Viewable
+	class Railtie < Rails::Railtie
+		generators do
+			require "generators/viewable/install_generator"
+		end
+	end
+end

data/lib/viewable/viewable.rb

@@ -1,2 +1,2 @@
-require 'viewable/version'
-require 'viewable/railtie'
+require 'viewable/version'
+require 'viewable/railtie'

data/viewable.gemspec

@@ -1,30 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'viewable/version'
-
-Gem::Specification.new do |s|
-	# metadata
-	s.name        = 'viewable'
-	s.version     = Viewable::VERSION
-	s.licenses    = ['MIT']
-	s.summary     = %q{a viewings calendar gem for rails 4.0}
-	s.description = %q{Viewable is a Rails 4.0 gem that enables you to add resource viewing functionality to your Rails application. A resource can be anything that is viewable e.g. function room, conference hall. }
-	s.authors     = ["Tom Cox", "crmis"]
-	s.email       = 'tom.jcox@icloud.com'
-	s.homepage    = 'https://github.com/crmis/viewable-gem'
-
-	# file settings
-	s.files         = `git ls-files`.split($/)
-	s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-	s.require_paths = ["lib","lib/viewable","lib/viewable/generators", "lib/viewable/generators/viewable"]
-
-	# development dependencies
-	s.add_development_dependency 'bundler', '~> 1.8'
-	s.add_development_dependency 'rake', '~> 10.4'
-
-	# runtime dependencies
-	s.add_dependency 'jbuilder', '~> 2.0'
-	s.add_dependency 'rails_12factor', '~> 0.0.3'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |s|
+	# metadata
+	s.name        = 'viewable'
+	s.version     = '0.5.8'
+	s.licenses    = ['MIT']
+	s.summary     = %q{a viewings calendar gem for rails 4.0}
+	s.description = %q{Viewable is a Rails 4.0 gem that enables you to add resource viewing functionality to your Rails application. A resource can be anything that is viewable e.g. function room, conference hall. }
+	s.authors     = ["Tom Cox", "crmis"]
+	s.email       = 'tom.jcox@icloud.com'
+	s.homepage    = 'https://github.com/crmis/viewable-gem'
+
+	# file settings
+	# This gem will work with 1.9.5 or greater...
+	s.required_ruby_version = '>= 1.9.5'
+	s.files         = `git ls-files`.split($/)
+	s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+	s.require_paths = ["lib","lib/viewable","lib/viewable/generators", "lib/viewable/generators/viewable"]
+
+	# development dependencies
+	s.add_development_dependency 'bundler', '~> 1.8'
+	s.add_development_dependency 'rake', '~> 10.4'
+
+	# runtime dependencies
+	s.add_dependency 'jbuilder', '~> 2.0'
+	s.add_dependency 'rails_12factor', '~> 0.0.3'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viewable
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Tom Cox
@@ -114,7 +114,6 @@ files:
 - lib/viewable/generators/viewable/viewing_model_generator.rb
 - lib/viewable/generators/viewable/views_generator.rb
 - lib/viewable/railtie.rb
-- lib/viewable/version.rb
 - lib/viewable/viewable.rb
 - viewable.gemspec
 homepage: https://github.com/crmis/viewable-gem
@@ -132,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -140,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: a viewings calendar gem for rails 4.0