pettanr_pettan_public_v01_licenses 0.1.10 → 0.1.11

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODgyMjdiYzg2Njg5ZjVhNTYyMDJiZTEyNWY1N2JiODhlZDBmNzcxYQ==
+  data.tar.gz: !binary |-
+    NGUxMTY1ZTdlMWEzNjI2NzFhODhiNzBiOGU4OGQyYTRmMTkwMmUzMQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZWUzNTEzNDIyZTBlNWU4ZWZkZTExNTk2Nzk3YTdkNmZiNGMwNzA5OGExMDFl
+    ZWViNzQyNTQxNzYwMGE5ZGNjMDBiNTkwZTZhZjg3ZjdhMGRiMmQ1MzUzNjYy
+    YWU5NDc5N2U2NTQ1OTNjMjJjMGRlMWQzNThkZWU0NDcyZWMwYjk=
+  data.tar.gz: !binary |-
+    ODYxNzE2YmIxNjhjZWQ3MmY5NmRiMDc5OTczNjkyNGEwMTcyNGQ4NDc4Mzk4
+    NzMwZDk4MzBhNzFiNjlhMzZmNjg4NTc0MjdhMTE1OWU5MWMzZDhhYjljNjBm
+    ZWQ0Y2RkNTQ0MjI5ZWNmMzBjOTUzOGY0NjkwYzk2NjY3MjZhODA=

data/app/controllers/pettanr_pettan_public_v01_licenses/attributes_controller.rb

@@ -2,47 +2,5 @@ require_dependency "pettanr_pettan_public_v01_licenses/application_controller"
 
 module PettanrPettanPublicV01Licenses
   class AttributesController < ApplicationController
-    before_filter :authenticate_user, :only => [:new, :create]
-    before_filter :authenticate_artist, :only => [:new, :create]
-    
-    def self.my_module
-      PettanrPettanPublicV01Licenses
-    end
-    
-    def self.my_model
-      PettanrPettanPublicV01Licenses::Attribute
-    end
-    
-    def new
-      @original_picture, @original_picture_license_group, @license_group = 
-        self.class.my_model.remember_params params, @operators
-      @attr = @license_group.my_engine.new_attribute {}
-      # rare case !  
-      # Attribute need artist name by @operators  
-      @attr.supply_default @operators
-
-      respond_to do |format|
-        format.html
-      end
-    end
-
-    def create
-      @original_picture, @original_picture_license_group, @license_group = 
-        self.class.my_model.remember_params params, @operators
-      @attr = self.class.my_module.new_attribute params[:attributes]
-      @license = ::License.show @attr.license_id, @operators
-      @resource_picture = @original_picture.resource_picture || ResourcePicture.new
-      @resource_picture.attributes = @attr.resource_picture_attributes @original_picture, @license
-      @resource_picture.overwrite @original_picture
-      respond_to do |format|
-        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
-          format.html { render action: "new" }
-          format.json { render json: @resource_picture.errors, status: :unprocessable_entity }
-        end
-      end
-    end
   end
 end

data/app/models/pettanr_pettan_public_v01_licenses/attribute.rb

@@ -1,7 +1,6 @@
 module PettanrPettanPublicV01Licenses
   class Attribute < ActiveRecord::Base
     
-    validates :license_id, :presence => true, :numericality => true #, :existence => true
     validates :artist_name, :presence => true
     # validates :caption, :presence => true
     # validates :sources, :presence => true
@@ -10,51 +9,9 @@ module PettanrPettanPublicV01Licenses
       self.artist_name = operators.artist.name
     end
     
-    def resource_picture_attributes op, ls
-      {
-        :original_picture_id => op.id, 
-        :license_id => ls.id, 
-        :artist_name => self.artist_name, 
-        :system_picture_id => ls.system_picture_id,
-        :license_group_module_name => ls.license_group_module_name, 
-        :license_group_settings => ls.license_group_settings,
-        :credit_picture_settings => ls.credit_picture_settings, 
-        :license_settings => {
-          :license_id => ls.id,
-          # :system_picture_id => ls.system_picture_id, # no save
-          :artist_name => self.artist_name, 
-          :caption => self.caption, 
-          :sources => self.sources
-        }.to_json
-      }
-    end
-    
-    def self.remember_params params, operators
-      op = OriginalPicture.show params[:original_picture_id], operators
-      oplg = OriginalPictureLicenseGroup.new(params[:original_picture_license_group])
-      lg = LicenseGroup.show oplg.license_group_id, operators
-      [op, oplg, lg]
-    end
-    
-    def engine_name
-      "pettanr_pettan_public_v01_licenses"
-    end
-    
-    def form_name
-      self.engine_name + '/attributes'
-    end
-    
     def label_name field_name = nil
       self.class.to_s + (field_name ? '.' + field_name : '')
     end
     
-    def trans_name field_name = nil
-      self.engine_name + '.' + field_name
-    end
-    
-    def tag_name field_name
-      'attributes[' + field_name + ']'
-    end
-    
   end
 end

data/app/models/pettanr_pettan_public_v01_licenses/license.rb

@@ -1,16 +1,16 @@
 module PettanrPettanPublicV01Licenses
   class License < ActiveRecord::Base
-    validates :open, :presence => true, :numericality => true, :existence => true
-    validates :commercial, :presence => true, :numericality => true, :existence => true
-    validates :official, :presence => true, :numericality => true, :existence => true
-    validates :attribution, :presence => true, :numericality => true, :existence => true
-    validates :derive, :presence => true, :numericality => true, :existence => true
-    validates :thumbnail, :presence => true, :numericality => true, :existence => true
-    validates :gif_convert, :presence => true, :numericality => true, :existence => true
-    validates :reverse, :presence => true, :numericality => true, :existence => true
-    validates :sync_vh, :presence => true, :numericality => true, :existence => true
-    validates :overlap, :presence => true, :numericality => true, :existence => true
-    validates :trackback, :presence => true, :numericality => true, :existence => true
+    validates :open, :presence => true, :numericality => true
+    validates :commercial, :presence => true, :numericality => true
+    validates :official, :presence => true, :numericality => true
+    validates :attribution, :presence => true, :numericality => true
+    validates :derive, :presence => true, :numericality => true
+    validates :thumbnail, :presence => true, :numericality => true
+    validates :gif_convert, :presence => true, :numericality => true
+    validates :reverse, :presence => true, :numericality => true
+    validates :sync_vh, :presence => true, :numericality => true
+    validates :overlap, :presence => true, :numericality => true
+    validates :trackback, :presence => true, :numericality => true
     
     def supply_default
     end

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

@@ -11,7 +11,7 @@
     <td>
       <%  picture.boosts 'post' %>
       <div class="md5">
-        <%= h(truncate(picture.artist_name, :length => 12)) %>
+        <%= h(truncate(picture.attribute_extend.artist_name, :length => 12)) %>
       </div>
       <div class="md5">
         <%= h(truncate(picture.attribute_extend.caption, :length => 12)) %>

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

@@ -2,7 +2,7 @@
   <tr>
     <td colspan="2">
       <%= link_to(
-        tag(:img, :src => picture.license.system_picture.url, 
+        tag(:img, :src => picture.system_picture.url, 
         :alt => h(picture.alt_name), 
         :width => picture.system_picture.width, :height => picture.system_picture.height), 
         picture.license.url )
@@ -15,16 +15,16 @@
     </td>
   </tr>
   <tr>
-    <td><%= t_m picture.attribute_extend.label_name() -%></td>
+    <td><%= t_m 'LicenseGroup' -%></td>
     <td><%= link_to(h(picture.license.license_group.caption), picture.license.license_group.url) -%></td>
   </tr>
   <tr>
-    <td><%= t_m picture.attribute_extend.label_name('license_id') -%></td>
+    <td><%= t_m 'License' -%></td>
     <td><%= link_to(h(picture.license.caption), picture.license.url) -%></td>
   </tr>
   <tr>
     <td><%= t_m picture.attribute_extend.label_name('artist_name') -%></td>
-    <td><%= h(picture.artist_name) -%></td>
+    <td><%= h(picture.attribute_extend.artist_name) -%></td>
   </tr>
   <tr>
     <td><%= t_m picture.attribute_extend.label_name('caption') -%></td>

data/db/migrate/20121008012741_create_pettanr_pettan_public_v01_licenses_attributes.rb

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

data/lib/pettanr_pettan_public_v01_licenses/version.rb

@@ -1,3 +1,3 @@
 module PettanrPettanPublicV01Licenses
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,32 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_pettan_public_v01_licenses
 version: !ruby/object:Gem::Version
-  version: 0.1.10
-  prerelease: 
+  version: 0.1.11
 platform: ruby
 authors:
 - yasushiito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-06-20 00:00:00.000000000 Z
+dependencies: []
 description: This software is a license plugin for PettanR
 email:
 - yasusiito@gmail.com
@@ -34,6 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/assets/javascripts/pettanr_pettan_public_v01_licenses/application.js
 - app/assets/javascripts/pettanr_pettan_public_v01_licenses/attributes.js
 - app/assets/stylesheets/pettanr_pettan_public_v01_licenses/application.css
@@ -45,55 +31,47 @@ files:
 - app/models/pettanr_pettan_public_v01_licenses/attribute.rb
 - app/models/pettanr_pettan_public_v01_licenses/credit_picture.rb
 - app/models/pettanr_pettan_public_v01_licenses/license.rb
-- app/views/pettanr_pettan_public_v01_licenses/attributes/new.html.erb
-- app/views/pettanr_pettan_public_v01_licenses/attributes/_confirm.html.erb
 - app/views/pettanr_pettan_public_v01_licenses/attributes/_credit.html.erb
-- app/views/pettanr_pettan_public_v01_licenses/attributes/_form.html.erb
 - app/views/pettanr_pettan_public_v01_licenses/attributes/_full_credit.html.erb
-- app/views/pettanr_pettan_public_v01_licenses/attributes/_note.html.erb
 - config/locales/pettanr_pettan_public_v01_licenses.ja.yml
 - config/routes.rb
-- db/b1.png
-- db/migrate/20121008012741_create_pettanr_pettan_public_v01_licenses_attributes.rb
-- db/migrate/20140408085215_create_pettanr_pettan_public_v01_licenses_licenses.rb
-- db/migrate/20140408085232_create_pettanr_pettan_public_v01_licenses_credit_pictures.rb
-- db/migrate/20140414094239_fix_pettanr_pettan_public_v01_licenses_attributes_system_picture_id.rb
 - db/PetaPublic_BY.png
 - db/PetaPublic_BY_SA.png
 - db/PetaPublic_BY_SA_TB.png
 - db/PetaPublic_BY_TB.png
+- db/b1.png
+- db/migrate/20121008012741_create_pettanr_pettan_public_v01_licenses_attributes.rb
+- db/migrate/20140408085215_create_pettanr_pettan_public_v01_licenses_licenses.rb
+- db/migrate/20140408085232_create_pettanr_pettan_public_v01_licenses_credit_pictures.rb
 - db/pettanr_pettan_public_v01_license.json
 - db/pettanr_pettan_public_v01_license.yml
+- lib/pettanr_pettan_public_v01_licenses.rb
 - lib/pettanr_pettan_public_v01_licenses/engine.rb
 - lib/pettanr_pettan_public_v01_licenses/version.rb
-- lib/pettanr_pettan_public_v01_licenses.rb
 - lib/tasks/pettanr_pettan_public_v01_licenses.rake
 - lib/tasks/pettanr_pettan_public_v01_licenses_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: https://github.com/yasushiito/pettanr_ppub_v01_licenses/wiki
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pettan Public License for PettanR
 test_files: []

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_confirm.html.erb

@@ -1,8 +0,0 @@
-<div>
-<h2><%= t('pettanr_pettan_public_v01_licenses.digest_credit') -%></h2>
-<%= render @resource_picture.credit_template, :picture => @resource_picture %>
-</div>
-<div>
-<h2><%= t('pettanr_pettan_public_v01_licenses.full_credit') -%></h2>
-<%= render @resource_picture.full_credit_template, :picture => @resource_picture %>
-</div>

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

@@ -1,39 +0,0 @@
-<%= form_tag(@attr.form_name) do %>
-  <%= render 'system/error_explanation', :obj => @attr %>
-
-  <table class="no-border">
-    <tr>
-      <td><%= t_m 'LicenseGroup' -%></td>
-      <td><%= t_m @attr.label_name -%></td>
-      <td><%= t(@attr.trans_name('selected')) -%></td>
-    </tr>
-    <tr>
-      <td><%= t_m @attr.label_name('license_id') -%></td>
-      <td><%= collection_select :attributes, :license_id, @license_group.licenses.map {|l| [l.caption, l.id] }, :last, :first -%></td>
-      <td><%= t(@attr.trans_name('no_blank')) -%></td>
-    </tr>
-    <tr>
-      <td><%= t_m @attr.label_name('artist_name') -%></td>
-      <td><%= text_field_tag @attr.tag_name('artist_name'), @attr.artist_name -%></td>
-      <td><%= t(@attr.trans_name('no_blank')) -%></td>
-    </tr>
-    <tr>
-      <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 @attr.label_name('sources') -%></td>
-      <td><%= text_area_tag @attr.tag_name('sources'), @attr.sources -%></td>
-      <td></td>
-    </tr>
-  </table>
-
-  <%= hidden_field_tag :original_picture_id, @original_picture.id %>
-  <%= hidden_field_tag 'original_picture_license_group[original_picture_id]', @original_picture_license_group.original_picture_id %>
-  <%= hidden_field_tag 'original_picture_license_group[license_group_id]', @original_picture_license_group.license_group_id %>
-
-  <div class="actions">
-    <%= submit_tag t(@attr.trans_name('next')) %>
-  </div>
-<% end %>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/_note.html.erb

@@ -1 +0,0 @@
-<%= tag(:img, @original_picture.opt_img_tag) -%>

data/app/views/pettanr_pettan_public_v01_licenses/attributes/new.html.erb

@@ -1,4 +0,0 @@
-<h1><%= t('pettanr_pettan_public_v01_licenses.title') %></h1>
-<%= @page_title = t('pettanr_pettan_public_v01_licenses.title') %>
-<%= render 'pettanr_pettan_public_v01_licenses/attributes/note' %>
-<%= render 'pettanr_pettan_public_v01_licenses/attributes/form' %>

data/db/migrate/20140414094239_fix_pettanr_pettan_public_v01_licenses_attributes_system_picture_id.rb

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