qiita-export 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a761de535b3fac30e81ce02879ccecad548aaa
-  data.tar.gz: f7e388a44e4e543b30beca43b30b2d73d125999f
+  metadata.gz: f2643db2f14d425da768e96d073f13f14455f19c
+  data.tar.gz: ceb813fc819fffe7a647ebab3b964e2930739b55
 SHA512:
-  metadata.gz: 55c498a11247a4179ecf9987af52a046327931449471a160bedeab72deff77c43d5ea0d93159e1ab6ed9e08989f9fdbb0283561520a08a1c05090a14e8c85076
-  data.tar.gz: 09558c17f085b0d3ea750728bd6ca1f807dc6adc01fe594681cbc89cdb76c2d6a6d28e54bf048867bc2298493f205a26f68761ed46fe3a7e4ee34e58951f9445
+  metadata.gz: 357f1ede7cb38d312b07302de64b15744b0562e8b874688ac276ef2af361b512d7ad3d3f6fe5eb14caeb920763bb171af684fe8f150822eff114499a3fb0a39e
+  data.tar.gz: 6a96c26613fb1a7c197012beb9f7abfb2d8b3c87b8148e21620547dc95bca6b64a9c0c694fe04c844ae2aab5b24db68ab6e2a1fcf72bc257e3f11696f81cb82f

data/README.md

@@ -41,6 +41,8 @@ Usage: qiita-export [options]
     -o, --output-dir=dirpath         specify the full path of destination directory.
     -a, --api-token=token            specify API token for Qiita.
     -e, --exclude-pattern=regexp     specify the regexp pattern to exclude article title.
+    -g, --original-image-filename    export by original image file name
+        --no-rc                      ignore .qiita-exportrc files.
 ```
 
 ## Contributing

data/lib/qiita-export/config.rb

@@ -32,13 +32,17 @@ module QiitaExport
           opt.on('-o', '--output-dir=dirpath',     'specify the full path of destination directory.')      { |v| @option[:'output-dir'] = v }
           opt.on('-a', '--api-token=token',        'specify API token for Qiita.')                         { |v| @option[:'api-token'] = v }
           opt.on('-e', '--exclude-pattern=regexp', 'specify the regexp pattern to exclude article title.') { |v| @option[:'exclude-pattern'] = v }
+          opt.on('-g', '--original-image-filename','export by original image file name')                   { |v| @option[:'original-image-filename'] = v }
+          opt.on('--no-rc',                        'ignore .qiita-exportrc files.')                        { |v| @option[:'no-rc'] = v }
         end
 
-        # load home config
-        @parser.load(File.expand_path(HOME_CONFIG_FILE))
+        unless argv.include?("--no-rc")
+          # load home config
+          @parser.load(File.expand_path(HOME_CONFIG_FILE))
 
-        # load local config
-        @parser.load(File.expand_path(LOCAL_CONFIG_FILE))
+          # load local config
+          @parser.load(File.expand_path(LOCAL_CONFIG_FILE))
+        end
 
         # parse argv
         @parser.parse!(argv)
@@ -116,6 +120,10 @@ module QiitaExport
         @option[:comment]
       end
 
+      def original_image_filename?
+        @option[:'original-image-filename']
+      end
+
       def team_url?(url)
         url !~ /^https?:\/\/qiita\.com/
       end

data/lib/qiita-export/image.rb

@@ -4,22 +4,35 @@ require 'uri'
 
 module QiitaExport
   class Image
-    attr_reader :key, :url
+    attr_reader :key, :url, :filename, :org_filename
 
     IMAGE_DIR = "images"
 
-    def initialize(key, url)
-      @key = key
-      @url = url
+    def initialize(key, url, filename, org_filename)
+      @key          = key
+      @url          = url
+      @filename     = filename
+      @org_filename = org_filename
     end
 
     def self.extract_urls(key, markdown)
-      image_urls = markdown.scan(/!\[.*?\]\((.+?)(?: \".*?\")?\)/).flatten
+      image_urls = markdown.scan(/!\[(.*?)\]\((.+?)(?: \".*?\")?\)/)
       image_urls.map do |image_url|
-        new(key, image_url)
+        url          = image_url[1]
+        filename     = File.basename(url)
+        org_filename = if image_url[0].nil? || image_url[0].empty?
+                         filename
+                       else
+                         image_url[0]
+                       end
+        new(key, url, filename, org_filename)
       end
     end
 
+    def output_filename
+      Config.original_image_filename? ? @org_filename : @filename
+    end
+
     def require_auth?
       @url !~ /qiita-image-store.s3.amazonaws.com/
     end
@@ -28,16 +41,12 @@ module QiitaExport
       require_auth? ? Config.auth_header : Config.default_header
     end
 
-    def filename
-      "#{File.basename(url)}"
-    end
-
     def save(path)
       image_dir = File.join(File.expand_path(path), IMAGE_DIR)
 
       FileUtils.makedirs(image_dir) unless Dir.exists?(image_dir)
 
-      file_path = File.join(image_dir, filename)
+      file_path = File.join(image_dir, output_filename)
 
       open(file_path, 'wb') do |out|
         open(@url, request_header) do |image|

data/lib/qiita-export/version.rb

@@ -1,4 +1,4 @@
 module QiitaExport
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 

data/spec/qiita-export/image_spec.rb

@@ -5,13 +5,15 @@ require 'qiita-export'
 
 describe QiitaExport::Image do
   let(:valid_key) { '99999999999999999999' }
-  let(:valid_url) { 'http://qiita-image-store.s3.amazonaws.com/example.jpg' }
+  let(:valid_url) { 'http://qiita-image-store.s3.amazonaws.com/2c8ab5c7-8903-b9c6-e08f-82c745a594e5.jpeg' }
+  let(:valid_filename) { '2c8ab5c7-8903-b9c6-e08f-82c745a594e5.jpeg' }
+  let(:valid_org_filename) { 'example.jpg' }
 
   describe ".new" do
 
     context "with arguments" do
       let(:arguments) do
-        [valid_key, valid_url]
+        [valid_key, valid_url, valid_filename, valid_org_filename]
       end
 
       subject do
@@ -41,8 +43,8 @@ describe QiitaExport::Image do
   let(:include_images) {
     <<-"EOS"
 ## Example Markdown
-![foo.png](https://example.com/foo.png "foo.png")
-![bar.png](https://example.com/bar.png)
+![foo.png](https://example.com/foo1234567.png "foo.png")
+![bar.png](https://example.com/bar8901234.png)
     EOS
   }
 
@@ -63,9 +65,13 @@ describe QiitaExport::Image do
       it { expect(subject).not_to be_empty }
       it { expect(subject.length).to eq(2) }
       it { expect(subject.first).to be_an_instance_of(QiitaExport::Image) }
-      it { expect(subject.first.url).to eq('https://example.com/foo.png') }
+      it { expect(subject.first.url).to eq('https://example.com/foo1234567.png') }
+      it { expect(subject.first.filename).to eq('foo1234567.png') }
+      it { expect(subject.first.org_filename).to eq('foo.png') }
       it { expect(subject.last).to be_an_instance_of(QiitaExport::Image) }
-      it { expect(subject.last.url).to eq('https://example.com/bar.png') }
+      it { expect(subject.last.url).to eq('https://example.com/bar8901234.png') }
+      it { expect(subject.last.filename).to eq('bar8901234.png') }
+      it { expect(subject.last.org_filename).to eq('bar.png') }
     end
 
     context "when there is no image urls" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-export
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shin Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3