pettanr_pettan_commons_v01_licenses 0.1.4 → 0.1.5

data/app/controllers/pettanr_pettan_commons_v01_licenses/attributes_controller.rb

@@ -2,8 +2,7 @@ require_dependency "pettanr_pettan_commons_v01_licenses/application_controller"
 
 module PettanrPettanCommonsV01Licenses
   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
@@ -26,7 +25,7 @@ module PettanrPettanCommonsV01Licenses
       @pettan_commons_license = PettanrPettanCommonsV01Licenses::Attribute.new params[:pettan_commons_license]
       @license = License.show @pettan_commons_license.license_id, @operators
       @resource_picture = @original_picture.resource_picture || ResourcePicture.new
-      @resource_picture.attributes = @pettan_commons_license.resource_picture_attributes @original_picture
+      @resource_picture.attributes = @pettan_commons_license.resource_picture_attributes @original_picture, @license
       @resource_picture.overwrite @original_picture
       respond_to do |format|
         if @pettan_commons_license.valid?

data/app/models/pettanr_pettan_commons_v01_licenses/attribute.rb

@@ -2,18 +2,26 @@ module PettanrPettanCommonsV01Licenses
   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
     
     def supply_default operators
       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, 
+          :sources => self.sources
+        }.to_json
       }
     end
     
@@ -24,13 +32,5 @@ module PettanrPettanCommonsV01Licenses
       [op, oplg, lg]
     end
     
-    def credit
-      {
-        :system_picture_id => self.license.system_picture_id,
-        :caption => self.caption, 
-        :sources => self.sources
-      }.to_json.to_s
-    end
-    
   end
 end

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

@@ -7,16 +7,17 @@
       %>
     </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' %>
         <% source_url_btn = SystemPicture.find(picture.license.credit_picture_extend.source_url_btn_id) %>
-        <% urls = picture.credit_data['sources'].to_s.gsub(/\r/, '').split(/\n/) -%>
+        <% urls = picture.attribute_extend.sources.to_s.gsub(/\r/, '').split(/\n/) -%>
         <% urls[0..2].compact.each do |url| -%>
           <%= link_to(
             tag(:img, :src => source_url_btn.url, :alt => 'source url', :width => source_url_btn.width, :height => source_url_btn.height), 

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

@@ -26,12 +26,12 @@
   </tr>
   <tr>
     <td><%= t_m 'PettanrPettanCommonsV01Licenses::Attribute.caption' -%></td>
-    <td><%= h picture.credit_data['caption'] -%></td>
+    <td><%= h picture.attribute_extend.caption -%></td>
   </tr>
   <tr>
     <td><%= t_m 'PettanrPettanCommonsV01Licenses::Attribute.sources' -%></td>
     <td>
-      <% picture.credit_data['sources'].to_s.gsub(/\r/, '').split(/\n/).each do |url| -%>
+      <% picture.attribute_extend.sources.to_s.gsub(/\r/, '').split(/\n/).each do |url| -%>
         <div><%= link_to(h(url), url) -%></div>
       <% end -%>
     </td>

data/db/migrate/20140414094025_fix_pettanr_pettan_commons_v01_licenses_attributes_system_picture_id.rb

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

data/lib/pettanr_pettan_commons_v01_licenses/version.rb

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

data/lib/pettanr_pettan_commons_v01_licenses.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_pettan_commons_v01_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-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,6 +76,7 @@ files:
 - db/migrate/20121008030508_create_pettanr_pettan_commons_v01_licenses_attributes.rb
 - db/migrate/20140401102950_create_pettanr_pettan_commons_v01_licenses_licenses.rb
 - db/migrate/20140401234553_create_pettanr_pettan_commons_v01_licenses_credit_pictures.rb
+- db/migrate/20140414094025_fix_pettanr_pettan_commons_v01_licenses_attributes_system_picture_id.rb
 - db/PetaCommon_BY.png
 - db/PetaCommon_BY_NC.png
 - db/PetaCommon_BY_NC_ND.png