pettanr_creative_commons_v30_licenses 0.1.5 → 0.1.6

data/app/controllers/pettanr_creative_commons_v30_licenses/attributes_controller.rb

@@ -8,25 +8,24 @@ module PettanrCreativeCommonsV30Licenses
     def new
       @original_picture, @original_picture_license_group, @license_group = 
         PettanrCreativeCommonsV30Licenses::Attribute.remember_params params, @operators
-      @creative_commons_license = PettanrCreativeCommonsV30Licenses::Attribute.new
-      @creative_commons_license.supply_default @operators
+      @attr = @license_group.my_engine.new_attribute {}
+      @attr.supply_default @operators
 
       respond_to do |format|
-        format.html # new.html.erb
-#        format.js
+        format.html
       end
     end
 
     def create
       @original_picture, @original_picture_license_group, @license_group = 
         PettanrCreativeCommonsV30Licenses::Attribute.remember_params params, @operators
-      @creative_commons_license = PettanrCreativeCommonsV30Licenses::Attribute.new params[:creative_commons_license]
-      @license = License.show @creative_commons_license.license_id, @operators
+      @attr = PettanrCreativeCommonsV30Licenses.new_attribute params[:creative_commons_license]
+      @license = License.show @attr.license_id, @operators
       @resource_picture = @original_picture.resource_picture || ResourcePicture.new
-      @resource_picture.attributes = @creative_commons_license.resource_picture_attributes @original_picture, @license
+      @resource_picture.attributes = @attr.resource_picture_attributes @original_picture, @license
       @resource_picture.overwrite @original_picture
       respond_to do |format|
-        if @creative_commons_license.valid?
+        if @attr.valid?
           format.html { render main_app.new_resource_picture_path }
           format.json { render json: @resource_picture.to_json(ResourcePicture.show_json_opt), status: :created }
         else

data/app/models/pettanr_creative_commons_v30_licenses/attribute.rb

@@ -1,8 +1,7 @@
 module PettanrCreativeCommonsV30Licenses
   class Attribute < ActiveRecord::Base
- #   belongs_to :license
     
- #   validates :license_id, :presence => true, :numericality => true, :existence => true
+    validates :license_id, :presence => true, :numericality => true #, :existence => true
     validates :artist_name, :presence => true
     validates :artist_url, :url => {:allow_blank => true}
     validates :source_url, :url => {:allow_blank => true}
@@ -17,11 +16,14 @@ module PettanrCreativeCommonsV30Licenses
         :original_picture_id => op.id, 
         :license_id => ls.id, 
         :artist_name => self.artist_name, 
+        :system_picture_id => ls.system_picture_id,
         :license_group_classname => ls.license_group_classname, 
         :license_group_settings => ls.license_group_settings,
         :credit_picture_settings => ls.credit_picture_settings, 
         :license_settings => {
-          :system_picture_id => ls.system_picture_id,
+          :license_id => ls.id,
+          # :system_picture_id => ls.system_picture_id, # no save
+          :artist_name => self.artist_name, 
           :caption => self.caption, 
           :artist_url => self.artist_url, 
           :source_url => self.source_url, 
@@ -37,5 +39,13 @@ module PettanrCreativeCommonsV30Licenses
       [op, oplg, lg]
     end
     
+    def label_name field_name = nil
+      self.class.to_s + (field_name ? '.' + field_name : '')
+    end
+    
+    def tag_name field_name
+      'creative_commons_license[' + field_name + ']'
+    end
+    
   end
 end

data/app/views/pettanr_creative_commons_v30_licenses/attributes/_credit.html.erb

@@ -2,7 +2,9 @@
   <tr>
     <td width="1px">
       <%= content_tag(:a, 
-        tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.license_group.caption.to_s + '[' + picture.license.caption.to_s + ']'), :width => picture.license.system_picture.width, :height => picture.license.system_picture.height), 
+        tag(:img, :src => picture.system_picture.url, 
+        :alt => h(picture.alt_name), 
+        :width => picture.system_picture.width, :height => picture.system_picture.height), 
         :href => picture.license.url )
       %>
     </td>
@@ -15,21 +17,24 @@
         <%= h(truncate(picture.attribute_extend.caption, :length => 12)) %>
       </div>
       <div class="md5">
-        <%  picture.license.boosts 'read' %>
         <% if picture.attribute_extend.source_url.blank? %>
         <% else %>
-          <% source_url_btn = SystemPicture.find(picture.license.credit_picture_extend.source_url_btn_id) %>
+          <% source_url_btn = picture.credit_picture_extend.source_url_btn %>
           <%= link_to(
-            tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height), 
+            tag(:img, :src => source_url_btn.url, :alt => 'source url', 
+              :width => source_url_btn.width, :height => source_url_btn.height
+            ), 
             picture.attribute_extend.source_url )
           %>
         <% end %>
         
         <% if picture.attribute_extend.more_permission_url.blank? %>
         <% else %>
-          <% source_url_btn = SystemPicture.find(picture.license.credit_picture_extend.source_url_btn_id) %>
+          <% source_url_btn = picture.credit_picture_extend.source_url_btn %>
           <%= link_to(
-            tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height), 
+            tag(:img, :src => source_url_btn.url, :alt => 'more_permission_url', 
+              :width => source_url_btn.width, :height => source_url_btn.height
+            ), 
             picture.attribute_extend.more_permission_url )
           %>
         <% end %>

data/app/views/pettanr_creative_commons_v30_licenses/attributes/_form.html.erb

@@ -1,46 +1,40 @@
-<% 
-  unless @creative_commons_license
-    @creative_commons_license = PettanrCreativeCommonsV30Licenses::Attribute.new
-    @creative_commons_license.supply_default @operators
-  end
- %>
 <%= form_tag('/pettanr_creative_commons_v30_licenses/attributes') do %>
-  <%= render 'system/error_explanation', :obj => @creative_commons_license %>
+  <%= render 'system/error_explanation', :obj => @attr %>
 
   <table class="no-border">
     <tr>
       <td><%= t_m 'LicenseGroup' -%></td>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute' -%></td>
+      <td><%= t_m @attr.label_name -%></td>
       <td><%= t('pettanr_creative_commons_v30_licenses.selected') -%></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.license_id' -%></td>
+      <td><%= t_m @attr.label_name('license_id') -%></td>
       <td><%= collection_select :creative_commons_license, :license_id, @license_group.licenses.map {|l| [l.caption, l.id] }, :last, :first -%></td>
       <td><%= t('pettanr_creative_commons_v30_licenses.no_blank') -%></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.artist_name' -%></td>
-      <td><%= text_field_tag 'creative_commons_license[artist_name]', @creative_commons_license.artist_name -%></td>
+      <td><%= t_m @attr.label_name('artist_name') -%></td>
+      <td><%= text_field_tag @attr.tag_name('artist_name'), @attr.artist_name -%></td>
       <td><%= t('pettanr_creative_commons_v30_licenses.no_blank') -%></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.caption' -%></td>
-      <td><%= text_field_tag 'creative_commons_license[caption]', @creative_commons_license.caption -%></td>
+      <td><%= t_m @attr.label_name('caption') -%></td>
+      <td><%= text_field_tag @attr.tag_name('caption'), @attr.caption -%></td>
       <td></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.artist_url' -%></td>
-      <td><%= text_field_tag 'creative_commons_license[artist_url]', @creative_commons_license.artist_url -%></td>
+      <td><%= t_m @attr.label_name('artist_url') -%></td>
+      <td><%= text_field_tag @attr.tag_name('artist_url'), @attr.artist_url -%></td>
       <td></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.source_url' -%></td>
-      <td><%= text_field_tag 'creative_commons_license[source_url]', @creative_commons_license.source_url -%></td>
+      <td><%= t_m @attr.label_name('source_url') -%></td>
+      <td><%= text_field_tag @attr.tag_name('source_url'), @attr.source_url -%></td>
       <td></td>
     </tr>
     <tr>
-      <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.more_permission_url' -%></td>
-      <td><%= text_field_tag 'creative_commons_license[more_permission_url]', @creative_commons_license.more_permission_url -%></td>
+      <td><%= t_m @attr.label_name('more_permission_url') -%></td>
+      <td><%= text_field_tag @attr.tag_name('more_permission_url'), @attr.more_permission_url -%></td>
       <td></td>
     </tr>
   </table>

data/app/views/pettanr_creative_commons_v30_licenses/attributes/_full_credit.html.erb

@@ -2,7 +2,9 @@
   <tr>
     <td colspan="2">
       <%= link_to(
-        tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.license_group.caption.to_s + '[' + picture.license.caption.to_s + ']'), :width => picture.license.system_picture.width, :height => picture.license.system_picture.height), 
+        tag(:img, :src => picture.license.system_picture.url, 
+        :alt => h(picture.alt_name), 
+        :width => picture.system_picture.width, :height => picture.system_picture.height), 
         picture.license.url )
       %>
     </td>

data/db/migrate/20121008044128_create_pettanr_creative_commons_v30_licenses_attributes.rb

@@ -1,7 +1,6 @@
 class CreatePettanrCreativeCommonsV30LicensesAttributes < ActiveRecord::Migration
   def change
     create_table :pettanr_creative_commons_v30_licenses_attributes do |t|
-      t.column :license_id, :integer, :null => false, :default => 0
       t.column :artist_name, :string, :null => false, :default => 'unknown'
       t.column :caption, :text 
       t.column :artist_url, :text 

data/lib/pettanr_creative_commons_v30_licenses.rb

@@ -54,21 +54,23 @@ module PettanrCreativeCommonsV30Licenses
     end
     
     def attribute_extend
-      self.new_attribute unless @attribute_extend
-      @attribute_extend ||= PettanrCreativeCommonsV30Licenses::Attribute.new
+      @attribute_extend
     end
     
     def attribute_extend= params
       # load attributes
-      @attribute_extend = PettanrCreativeCommonsV30Licenses::Attribute.new params
+      @attribute_extend = PettanrCreativeCommonsV30Licenses.new_attribute params
       # no supply default params
     end
     
-    def new_resource_picture params = {} 
-      @attribute_extend = PettanrCreativeCommonsV30Licenses::Attribute.new params
-      # Attribute's supply_default need operators
-      # @attribute_extend.supply_default operators
+  end
+  
+  module ModuleMethods
+    def new_attribute params = {}
+      PettanrCreativeCommonsV30Licenses::Attribute.new params
     end
     
   end
+
+  extend ModuleMethods
 end

data/lib/pettanr_creative_commons_v30_licenses/version.rb

@@ -1,3 +1,3 @@
 module PettanrCreativeCommonsV30Licenses
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_creative_commons_v30_licenses
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,9 +61,7 @@ files:
 - app/models/pettanr_creative_commons_v30_licenses/attribute.rb
 - app/models/pettanr_creative_commons_v30_licenses/credit_picture.rb
 - app/models/pettanr_creative_commons_v30_licenses/license.rb
-- app/views/layouts/pettanr_creative_commons_v30_licenses/application.html.erb
 - app/views/pettanr_creative_commons_v30_licenses/attributes/new.html.erb
-- app/views/pettanr_creative_commons_v30_licenses/attributes/new.js.erb
 - app/views/pettanr_creative_commons_v30_licenses/attributes/_confirm.html.erb
 - app/views/pettanr_creative_commons_v30_licenses/attributes/_credit.html.erb
 - app/views/pettanr_creative_commons_v30_licenses/attributes/_form.html.erb
@@ -82,7 +80,6 @@ files:
 - db/migrate/20121008044128_create_pettanr_creative_commons_v30_licenses_attributes.rb
 - db/migrate/20140408085033_create_pettanr_creative_commons_v30_licenses_licenses.rb
 - db/migrate/20140408085049_create_pettanr_creative_commons_v30_licenses_credit_pictures.rb
-- db/migrate/20140410234708_fix_pettanr_creative_commons_v30_licenses_attributes_system_picture_id.rb
 - db/pettanr_creative_commons_v30_license.json
 - db/pettanr_creative_commons_v30_license.yml
 - lib/pettanr_creative_commons_v30_licenses/engine.rb

data/app/views/layouts/pettanr_creative_commons_v30_licenses/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>PettanrCreativeCommonsV30Licenses</title>
-  <%= stylesheet_link_tag    "pettanr_creative_commons_v30_licenses/application", :media => "all" %>
-  <%= javascript_include_tag "pettanr_creative_commons_v30_licenses/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/app/views/pettanr_creative_commons_v30_licenses/attributes/new.js.erb

@@ -1 +0,0 @@
-$("#oplg").html("<%= escape_javascript(render('form')) -%>");

data/db/migrate/20140410234708_fix_pettanr_creative_commons_v30_licenses_attributes_system_picture_id.rb

@@ -1,8 +0,0 @@
-class FixPettanrCreativeCommonsV30LicensesAttributesSystemPictureId < ActiveRecord::Migration
-  def up
-    add_column :pettanr_creative_commons_v30_licenses_attributes, :system_picture_id, :integer, :null => false, :default => 0
-  end
-
-  def down
-  end
-end