pettanr_creative_commons_v30_licenses 0.1.4 → 0.1.5

data/app/controllers/pettanr_creative_commons_v30_licenses/attributes_controller.rb

@@ -2,8 +2,7 @@ require_dependency "pettanr_creative_commons_v30_licenses/application_controller
 
 module PettanrCreativeCommonsV30Licenses
   class AttributesController < ApplicationController
-    layout 'test' if MagicNumber['test_layout']
-    before_filter :authenticate_user!, :only => [:new, :create]
+    before_filter :authenticate_user, :only => [:new, :create]
     before_filter :authenticate_artist, :only => [:new, :create]
     
     def new
@@ -24,7 +23,7 @@ module PettanrCreativeCommonsV30Licenses
       @creative_commons_license = PettanrCreativeCommonsV30Licenses::Attribute.new params[:creative_commons_license]
       @license = License.show @creative_commons_license.license_id, @operators
       @resource_picture = @original_picture.resource_picture || ResourcePicture.new
-      @resource_picture.attributes = @creative_commons_license.resource_picture_attributes @original_picture
+      @resource_picture.attributes = @creative_commons_license.resource_picture_attributes @original_picture, @license
       @resource_picture.overwrite @original_picture
       respond_to do |format|
         if @creative_commons_license.valid?

data/app/models/pettanr_creative_commons_v30_licenses/attribute.rb

@@ -1,8 +1,8 @@
 module PettanrCreativeCommonsV30Licenses
   class Attribute < ActiveRecord::Base
-    belongs_to :license
+ #   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}
@@ -12,11 +12,21 @@ module PettanrCreativeCommonsV30Licenses
       self.artist_name = operators.artist.name
     end
     
-    def resource_picture_attributes op
+    def resource_picture_attributes op, ls
       {
-        :original_picture_id => op.id, :license_id => self.license.id, 
-        :artist_name => self.artist_name, :classname => self.license.license_group.classname, 
-        :credit => self.credit, :settings => self.license.settings
+        :original_picture_id => op.id, 
+        :license_id => ls.id, 
+        :artist_name => self.artist_name, 
+        :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,
+          :caption => self.caption, 
+          :artist_url => self.artist_url, 
+          :source_url => self.source_url, 
+          :more_permission_url => self.more_permission_url
+        }.to_json
       }
     end
     
@@ -27,15 +37,5 @@ module PettanrCreativeCommonsV30Licenses
       [op, oplg, lg]
     end
     
-    def credit
-      {
-        :system_picture_id => self.license.system_picture_id,
-        :caption => self.caption, 
-        :artist_url => self.artist_url, 
-        :source_url => self.source_url, 
-        :more_permission_url => self.more_permission_url
-      }.to_json.to_s
-    end
-    
   end
 end

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

@@ -7,29 +7,30 @@
       %>
     </td>
     <td>
+      <%  picture.boosts 'post' %>
       <div class="md5">
         <%= h(truncate(picture.artist_name, :length => 12)) %>
       </div>
       <div class="md5">
-        <%= h(truncate(picture.credit_data['caption'], :length => 12)) %>
+        <%= h(truncate(picture.attribute_extend.caption, :length => 12)) %>
       </div>
       <div class="md5">
         <%  picture.license.boosts 'read' %>
-        <% if picture.credit_data['source_url'].blank? %>
+        <% if picture.attribute_extend.source_url.blank? %>
         <% else %>
           <% source_url_btn = SystemPicture.find(picture.license.credit_picture_extend.source_url_btn_id) %>
           <%= link_to(
             tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height), 
-            picture.credit_data['source_url'] )
+            picture.attribute_extend.source_url )
           %>
         <% end %>
         
-        <% if picture.credit_data['more_permission_url'].blank? %>
+        <% if picture.attribute_extend.more_permission_url.blank? %>
         <% else %>
           <% source_url_btn = SystemPicture.find(picture.license.credit_picture_extend.source_url_btn_id) %>
           <%= link_to(
             tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height), 
-            picture.credit_data['more_permission_url'] )
+            picture.attribute_extend.more_permission_url )
           %>
         <% end %>
       </div>

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

@@ -14,7 +14,7 @@
   </tr>
   <tr>
     <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.artist_name' -%></td>
-    <td><%= link_to_if picture.credit_data['artist_url'], h(picture.artist_name), picture.credit_data['artist_url'] -%></td>
+    <td><%= link_to_if picture.attribute_extend.artist_url, h(picture.artist_name), picture.attribute_extend.artist_url -%></td>
   </tr>
   <tr>
     <td><%= t_m 'LicenseGroup' -%></td>
@@ -26,14 +26,14 @@
   </tr>
   <tr>
     <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.caption' -%></td>
-    <td><%= h picture.credit_data['caption'] -%></td>
+    <td><%= h picture.attribute_extend.caption -%></td>
   </tr>
   <tr>
     <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.source_url' -%></td>
-    <td><%= link_to(h(picture.credit_data['source_url']), picture.credit_data['source_url']) -%></td>
+    <td><%= link_to(h(picture.attribute_extend.source_url), picture.attribute_extend.source_url) -%></td>
   </tr>
   <tr>
     <td><%= t_m 'PettanrCreativeCommonsV30Licenses::Attribute.more_permission_url' -%></td>
-    <td><%= link_to(h(picture.credit_data['more_permission_url']), picture.credit_data['more_permission_url']) -%></td>
+    <td><%= link_to(h(picture.attribute_extend.more_permission_url), picture.attribute_extend.more_permission_url) -%></td>
   </tr>
 </table>

data/db/migrate/20140410234708_fix_pettanr_creative_commons_v30_licenses_attributes_system_picture_id.rb

@@ -0,0 +1,8 @@
+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

data/lib/pettanr_creative_commons_v30_licenses.rb

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

data/lib/pettanr_creative_commons_v30_licenses/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_creative_commons_v30_licenses
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,6 +82,7 @@ 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