librails 0.0.8 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c890f602347b27a6a2ecab1d66d26e8729985793
-  data.tar.gz: c84b18986329428ca9253b5239af5aa9c7d8fe13
+SHA256:
+  metadata.gz: a3aad5a76a6d9c629cf6387b64d341a804adabd632c8fdcfddef4dd0702bf45e
+  data.tar.gz: 031f1a09e924fb4350c3eb5618b4289e552a3d5525c27c932cbf9ad9153f36da
 SHA512:
-  metadata.gz: 994052f719f7fbd9e48b75ba19fb43c6016ae8780f6c05f67b816507c17cca476525b94ad563626d0b8881864f55464e11f407fab6897de80be121bab04fcc46
-  data.tar.gz: 6d4c2716c9a150f56af9afe31c5bf23dfd6ada0b57e935bd209e3d169d3a41315ec4e42da299a280108d5b1b47d5d518220ba33b10ee287b1d6be69ba2ce9e26
+  metadata.gz: bc1e6c57be67c423e2b0b46fe9c68fcd73bbc701d5ef4d30bea8bb92109df891541dbe1a24f9a20c81a6ffbc20c2e8fc09a374c1a6d8acfa232e4720722213f2
+  data.tar.gz: 252eb83a348d1b8dbc33256dc32429e6536e53e265c3ea2ee1ffe0dd2f5ab78d0f4e91240554762f85d2522de6bfa41d2946f23efe0909eda5427ec8156b5988

data/app/helpers/librails/application_helper.rb

@@ -25,7 +25,7 @@ module Librails
     def ransack_value(params, value_param, query_param = 'q')
       q = params[query_param]
       return nil unless q
-      return nil unless q.kind_of?(Hash)
+      return nil unless q.kind_of?(ActionController::Parameters)
       q[value_param]
     end
   end

data/app/helpers/librails/db_utils.rb

@@ -0,0 +1,5 @@
+module Librails
+  class DbUtils
+
+  end
+end

data/app/models/librails/form_param.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
-class FormParam
-  def initialize(id, label = nil, value = nil)
-    # 基本はIDとlabel。valueは特別な値を紐付けたい場合にのみ使用する。
-    @id = id
-    @label = label
-    if @label.nil?
-      @label = @id
+module Librails
+  class FormParam
+    def initialize(id, label = nil, value = nil)
+      # 基本はIDとlabel。valueは特別な値を紐付けたい場合にのみ使用する。
+      @id = id
+      @label = label
+      if @label.nil?
+        @label = @id
+      end
+      @value = value
     end
-    @value = value
+    attr_accessor :id, :label, :value
   end
-  attr_accessor :id, :label, :value
 end

data/lib/librails.rb

@@ -1,4 +1,7 @@
 require "librails/engine"
+#require "librails/version"
+require "librails/misc_utils"
+require "librails/model_utils"
 
 module Librails
 end

data/lib/librails/engine.rb

@@ -1,6 +1,10 @@
 module Librails
   class Engine < ::Rails::Engine
     isolate_namespace Librails
+
+    # Add a load path for this specific Engine
+    config.autoload_paths << File.expand_path("../../lib", __FILE__)
+
     initializer "librails.view_helper" do |app|
       ActiveSupport.on_load :action_view do
         require 'librails/view_helper'

data/lib/librails/misc_utils.rb

@@ -0,0 +1,13 @@
+module Librails
+  class MiscUtils
+    def self.rescue_mysql2_error(e)
+      if e.message =~ /Incorrect string value:/
+        # utf8mb4にすればいいのだ…。とりあえずそのばしのぎ。
+        puts e.message
+      else
+        puts e.message
+        puts e.backtrace
+      end
+    end
+  end
+end

data/lib/librails/model_utils.rb

@@ -0,0 +1,108 @@
+module Librails
+  # Model related utilities
+  class SortItem
+    attr_accessor :item
+    attr_accessor :id, :array_index
+  end
+
+  class ModelUtils
+    def self.set_array_index(item, attr_name, index)
+      set_disp_order(item, attr_name, index + 1)
+    end
+
+    def self.get_array_index(item, attr_name)
+      get_disp_order(item, attr_name) - 1
+    end
+
+    def self.set_disp_order(item, attr_name, value)
+      item.send("#{attr_name}=", value)
+    end
+
+    def self.get_disp_order(item, attr_name)
+      item.send(attr_name)
+    end
+
+    def self.reorder(items, hash, attr_name = 'disp_order', hash_key = 'disp_order')
+      #items: ソート対象のオブジェクト(attr_nameで指定された属性で並び替えられている)
+      #hash: idと順番のハッシュ(hash_keyで指定された属性に新しい順番が指定されている)
+      # hash = {
+      #    '10' => {'disp_order' => '1'},
+      #    '20' => {'disp_order' => '2'},
+      #    '30' => {'disp_order' => '2'},
+      #    '40' => {'disp_order' => '1'},
+      #}
+
+      # 最初に1からインデックスを振り直す
+      items.each_with_index do |item, index|
+        set_array_index(item, attr_name, index)
+      end
+
+      # 前準備、ソート対象になるオブジェクトをまとめる
+      sort_items = []
+      hash.keys.each do |idstr|
+        disp_order = hash[idstr][hash_key]
+        next unless disp_order
+        new_index = disp_order.to_i - 1
+
+        # 範囲内に補正
+        if new_index < 0
+          new_index = 0
+        end
+        if new_index >= items.size - 1
+          new_index = items.size - 1
+        end
+
+        # IDでオブジェクトを検索
+        id = idstr.to_i
+        item = items.find{|s| s.id == id}
+        next if get_array_index(item, attr_name) == new_index #変化が無い場合は次へ
+
+        # index=順番に変更があるものはsorted_itemsに記憶
+        sort_item = SortItem.new
+        sort_item.item = item
+        sort_item.id = id
+        sort_item.array_index = new_index
+        sort_items << sort_item
+      end
+
+      # 入れ替える前にソートしておく。ただしい順で番号を入れ直すために必要。
+      # 例えば以下のような指定を考える
+      # 10
+      # 20
+      # 30
+      # 40 - 2
+      # 50 - 1
+      # a)2,1の順で入れると以下のようになる
+      # 50 - 1
+      # 10
+      # 40 - 2(3番目になってしまっている)
+      # 20
+      # 30
+      # b)1,2の順で入れると正しい
+      # 50 - 1
+      # 40 - 2
+      # 10
+      # 20
+      # 30
+
+      sort_items.sort!{|a, b|
+        r = a.array_index <=> b.array_index
+        if r == 0
+          r = a.id <=> b.id
+        end
+        r
+      }
+      # 新しい位置に挿入
+      sort_items.each do |sort_item|
+        item = sort_item.item
+        items.delete_at(items.index(item)) #ソートの途中で順番が変わっている可能性があるのでその都度検索する必要あり。deleteはdbが削除されるので使えない
+        items[sort_item.array_index, 0] = item
+      end
+      items.each_with_index do |item, index|
+        set_array_index(item, attr_name, index)
+#        item.child_index = index + 1
+#        print "after #{index} title=#{item.title} #{item.child_index}\n"
+      end
+    end
+  end
+end

data/lib/librails/version.rb

@@ -1,3 +1,3 @@
 module Librails
-  VERSION = "0.0.8"
+  VERSION = "0.2.3"
 end

data/test/dummy/app/assets/javascripts/books.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/dummy/app/assets/stylesheets/books.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/test/dummy/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,56 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/test/dummy/app/controllers/books_controller.rb

@@ -0,0 +1,58 @@
+class BooksController < ApplicationController
+  before_action :set_book, only: [:show, :edit, :update, :destroy]
+
+  # GET /books
+  def index
+    @books = Book.all
+  end
+
+  # GET /books/1
+  def show
+  end
+
+  # GET /books/new
+  def new
+    @book = Book.new
+  end
+
+  # GET /books/1/edit
+  def edit
+  end
+
+  # POST /books
+  def create
+    @book = Book.new(book_params)
+
+    if @book.save
+      redirect_to @book, notice: 'Book was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /books/1
+  def update
+    if @book.update(book_params)
+      redirect_to @book, notice: 'Book was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /books/1
+  def destroy
+    @book.destroy
+    redirect_to books_url, notice: 'Book was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_book
+      @book = Book.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def book_params
+      params.require(:book).permit(:title, :author, :summary)
+    end
+end

data/test/dummy/app/helpers/books_helper.rb

@@ -0,0 +1,2 @@
+module BooksHelper
+end

data/test/dummy/app/models/book.rb

@@ -0,0 +1,2 @@
+class Book < ActiveRecord::Base
+end

data/test/dummy/app/views/books/_form.html.erb

@@ -0,0 +1,29 @@
+<%= form_for(@book) do |f| %>
+  <% if @book.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@book.errors.count, "error") %> prohibited this book from being saved:</h2>
+
+      <ul>
+      <% @book.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </div>
+  <div class="field">
+    <%= f.label :author %><br>
+    <%= f.text_field :author %>
+  </div>
+  <div class="field">
+    <%= f.label :summary %><br>
+    <%= f.text_area :summary %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/test/dummy/app/views/books/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Book</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @book %> |
+<%= link_to 'Back', books_path %>

data/test/dummy/app/views/books/index.html.erb

@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Books</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Title</th>
+      <th>Author</th>
+      <th>Summary</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @books.each do |book| %>
+      <tr>
+        <td><%= book.title %></td>
+        <td><%= book.author %></td>
+        <td><%= book.summary %></td>
+        <td><%= link_to 'Show', book %></td>
+        <td><%= link_to 'Edit', edit_book_path(book) %></td>
+        <td><%= link_to 'Destroy', book, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Book', new_book_path %>

data/test/dummy/app/views/books/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Book</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', books_path %>

data/test/dummy/app/views/books/show.html.erb

@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Title:</strong>
+  <%= @book.title %>
+</p>
+
+<p>
+  <strong>Author:</strong>
+  <%= @book.author %>
+</p>
+
+<p>
+  <strong>Summary:</strong>
+  <%= @book.summary %>
+</p>
+
+<%= link_to 'Edit', edit_book_path(@book) %> |
+<%= link_to 'Back', books_path %>

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
 
+  resources :books
   mount Librails::Engine => "/librails"
 end